summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/cow_sys.h
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2008-05-12 23:01:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-13 17:02:22 +0200
commit43f5b3085fdd27c4edf535d938b2cb0ccead4f75 (patch)
tree63eabda9f505ed0a07e0a12fd828674cde8f7861 /arch/um/drivers/cow_sys.h
parentuml: fix errno return (diff)
downloadlinux-43f5b3085fdd27c4edf535d938b2cb0ccead4f75.tar.xz
linux-43f5b3085fdd27c4edf535d938b2cb0ccead4f75.zip
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/cow_sys.h')
-rw-r--r--arch/um/drivers/cow_sys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index ca8c9e11a39b..f5701fd2ef90 100644
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
@@ -8,7 +8,7 @@
static inline void *cow_malloc(int size)
{
- return kmalloc(size, UM_GFP_KERNEL);
+ return uml_kmalloc(size, UM_GFP_KERNEL);
}
static inline void cow_free(void *ptr)