Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41a9e64c authored by Luca Bigliardi's avatar Luca Bigliardi Committed by Linus Torvalds
Browse files

uml: fix vde network backend in user mode linux 



* 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: default avatarLuca Bigliardi <shammash@artha.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Reviewed-by: default avatarWANG Cong <wangcong@zeuux.org>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 620565ef

arch/um/drivers/vde_user.c

+3 −3
Original line number Diff line number Diff line
@@ -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)