projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[linux-2.6]
/
arch
/
um
/
drivers
/
net_user.c
diff --git
a/arch/um/drivers/net_user.c
b/arch/um/drivers/net_user.c
index
abf2653
..
9415dd9
100644
(file)
--- a/
arch/um/drivers/net_user.c
+++ b/
arch/um/drivers/net_user.c
@@
-222,7
+222,7
@@
static void change(char *dev, char *what, unsigned char *addr,
netmask[2], netmask[3]);
output_len = UM_KERN_PAGE_SIZE;
- output = kmalloc(output_len, UM_GFP_KERNEL);
+ output =
uml_
kmalloc(output_len, UM_GFP_KERNEL);
if (output == NULL)
printk(UM_KERN_ERR "change : failed to allocate output "
"buffer\n");