[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1221612200-483-1-git-send-email-albertito@blitiri.com.ar>
Date: Tue, 16 Sep 2008 21:43:19 -0300
From: Alberto Bertogli <albertito@...tiri.com.ar>
To: jdike@...toit.com, linux-kernel@...r.kernel.org
Cc: Alberto Bertogli <albertito@...tiri.com.ar>
Subject: [PATCH] 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@...tiri.com.ar>
---
This patch is against the Linus' current (as of about 5 minutes ago) tree.
Without this patch, it wouldn't build.
I've tested it by booting my uml image, connecting it to the internet using
vde_witch, and doing some network operations (some aptitude installs).
Thanks a lot,
Alberto
arch/um/drivers/vde_user.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/um/drivers/vde_user.c b/arch/um/drivers/vde_user.c
index 56533db..744eacf 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");
--
1.6.0.87.g2858d
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists