lkml.org 
[lkml]   [2008]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] uml: Make vde_user.c build again
Date
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>
---

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


\
 
 \ /
  Last update: 2008-09-17 02:49    [W:0.409 / U:0.300 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site