git » linux-kernel » commit f18f258

uml: Make vde_user.c build again

author Alberto Bertogli
2008-09-17 00:21:17 UTC
committer Alberto Bertogli
2008-09-27 19:06:42 UTC
parent 0a530780e9150bba9b18c43c6506bbf8b2d08d2d
uml: Make vde_user.c build again

Commit 43f5b308 ("uml: fix build when SLOB is enabled") removed kmalloc()
from um_malloc.h, which breaks vde_user.c.

This patch fixes it by making vde_user.c call uml_kmalloc() instead of
kmalloc().

Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
arch/um/drivers/vde_user.c +1 -1 
diff --git a/arch/um/drivers/vde_user.c b/arch/um/drivers/vde_user.c
index 56533db2534..744eacf324c 100644
--- a/arch/um/drivers/vde_user.c
+++ b/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");