From e4d3a1411bb134a4efb75865edddc8e028b9ea90 Mon Sep 17 00:00:00 2001 From: Luca Bigliardi Date: Fri, 20 Feb 2009 15:38:36 -0800 Subject: [PATCH] --- yaml --- r: 131575 b: refs/heads/master c: 41a9e64ca4d60dc412cfcd42d5be5dec1f1ed427 h: refs/heads/master i: 131573: 4a570b6bd9fe4b3ed5929de7682807daed196bfa 131571: e7a4ad7b6b3dd19a953afa9465da2a506efac75f 131567: 41636606ea0d7e61c4dc221bbaef25b945ceb880 v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/vde_user.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1d1923ae0334..d8649b19b624 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 620565ef5f35f4196e5081417db381c16b0ae791 +refs/heads/master: 41a9e64ca4d60dc412cfcd42d5be5dec1f1ed427 diff --git a/trunk/arch/um/drivers/vde_user.c b/trunk/arch/um/drivers/vde_user.c index 56533db25343..c5c43253e6ce 100644 --- a/trunk/arch/um/drivers/vde_user.c +++ b/trunk/arch/um/drivers/vde_user.c @@ -78,7 +78,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init) { 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) { printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args " "allocation failed"); @@ -91,8 +91,8 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init) args->group = init->group; args->mode = init->mode ? init->mode : 0700; - args->port ? printk(UM_KERN_INFO "port %d", args->port) : - printk(UM_KERN_INFO "undefined port"); + args->port ? printk("port %d", args->port) : + printk("undefined port"); } int vde_user_read(void *conn, void *buf, int len)