[PATCH] uml: Make vde_user.c build again

[PATCH] uml: Make vde_user.c build again

[Alberto Bertogli]

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

Re: [PATCH] uml: Make vde_user.c build again

[WANG Cong]

On Tue, Sep 16, 2008 at 09:43:19PM -0300, Alberto Bertogli wrote:
>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");

http://lkml.org/lkml/2008/7/23/142


-- 
"Sometimes the only way to stay sane is to go a little crazy."

Re: [PATCH] uml: Make vde_user.c build again

[Alberto Bertogli]

On Wed, Sep 17, 2008 at 12:49:38PM +0100, WANG Cong wrote:
> On Tue, Sep 16, 2008 at 09:43:19PM -0300, Alberto Bertogli wrote:
> >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");
> 
> http://lkml.org/lkml/2008/7/23/142

Thanks. Is there anything I can do to help get this into mainline?

The patch(es) looks really simple, and without it the build is broken if
you use vde.

Thanks a lot,
		Alberto