diff options
| author | Jeff Dike <jdike@addtoit.com> | 2008-05-12 14:01:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-13 08:02:22 -0700 |
| commit | 43f5b3085fdd27c4edf535d938b2cb0ccead4f75 (patch) | |
| tree | 63eabda9f505ed0a07e0a12fd828674cde8f7861 /arch/um/drivers/daemon_user.c | |
| parent | 484f1e2c1ea58c6a4352313f7ee4edd4b52deecd (diff) | |
| download | kernel_samsung_espresso10-43f5b3085fdd27c4edf535d938b2cb0ccead4f75.zip kernel_samsung_espresso10-43f5b3085fdd27c4edf535d938b2cb0ccead4f75.tar.gz kernel_samsung_espresso10-43f5b3085fdd27c4edf535d938b2cb0ccead4f75.tar.bz2 | |
uml: fix build when SLOB is enabled
Reintroduce uml_kmalloc for the benefit of UML libc code. The
previous tactic of declaring __kmalloc so it could be called directly
from the libc side of the house turned out to be getting too intimate
with slab, and it doesn't work with slob.
So, the uml_kmalloc wrapper is back. It calls kmalloc or whatever
that translates into, and libc code calls it.
kfree is left alone since that still works, leaving a somewhat
inconsistent API.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers/daemon_user.c')
| -rw-r--r-- | arch/um/drivers/daemon_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c index f23c109..f8e85e0 100644 --- a/arch/um/drivers/daemon_user.c +++ b/arch/um/drivers/daemon_user.c @@ -34,7 +34,7 @@ static struct sockaddr_un *new_addr(void *name, int len) { struct sockaddr_un *sun; - sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL); + sun = uml_kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL); if (sun == NULL) { printk(UM_KERN_ERR "new_addr: allocation of sockaddr_un " "failed\n"); @@ -83,7 +83,7 @@ static int connect_to_switch(struct daemon_data *pri) goto out_close; } - sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL); + sun = uml_kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL); if (sun == NULL) { printk(UM_KERN_ERR "new_addr: allocation of sockaddr_un " "failed\n"); |