Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 14:50:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

uml: fix vde network backend in user mode linux

Browse Source 
* Replace kmalloc() with uml_kmalloc() (fix build failure)

* Remove unnecessary UM_KERN_INFO in printk() (don't display '<6>' while
  printing info)

Signed-off-by: Luca Bigliardi <shammash@artha.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Reviewed-by: WANG Cong <wangcong@zeuux.org>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Luca Bigliardi 2009-02-20 15:38:36 -08:00 committed by Linus Torvalds
parent 620565ef5f
commit 41a9e64ca4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/um/drivers/vde_user.c
View File

@ -78,7 +78,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
{ {
struct vde_open_args *args; struct vde_open_args *args;
vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL); vpri->args = uml_kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
if (vpri->args == NULL) { if (vpri->args == NULL) {
printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args " printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args "
"allocation failed"); "allocation failed");
@ -91,8 +91,8 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init)
args->group = init->group; args->group = init->group;
args->mode = init->mode ? init->mode : 0700; args->mode = init->mode ? init->mode : 0700;
args->port ? printk(UM_KERN_INFO "port %d", args->port) : args->port ? printk("port %d", args->port) :
printk(UM_KERN_INFO "undefined port"); printk("undefined port");
} }
int vde_user_read(void *conn, void *buf, int len) int vde_user_read(void *conn, void *buf, int len)