git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ice1724-pm' into for-linus
[pandora-kernel.git]
/
arch
/
um
/
drivers
/
port_user.c
diff --git
a/arch/um/drivers/port_user.c
b/arch/um/drivers/port_user.c
index
d269ca3
..
b49bf56
100644
(file)
--- a/
arch/um/drivers/port_user.c
+++ b/
arch/um/drivers/port_user.c
@@
-47,7
+47,7
@@
static void *port_init(char *str, int device, const struct chan_opts *opts)
if (kern_data == NULL)
return NULL;
- data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+ data =
uml_
kmalloc(sizeof(*data), UM_GFP_KERNEL);
if (data == NULL)
goto err;