diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-07-16 02:38:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:38 -0400 |
commit | e4c4bf9968cb4f0fceb1b8fb54790ccae73caf4e (patch) | |
tree | fe9892123214821c37a7b615fe52db7f6d46e148 /arch/um/drivers/slip_user.c | |
parent | c43990162fc7f9d2f15a12797fdc6f9c0905f704 (diff) |
uml: Eliminate kernel allocator wrappers
UML had two wrapper procedures for kmalloc, um_kmalloc and um_kmalloc_atomic
because the flag constants weren't available in userspace code.
kern_constants.h had made kernel constants available for a long time, so there
is no need for these wrappers any more. Rather, userspace code calls kmalloc
directly with the userspace versions of the gfp flags.
kmalloc isn't a real procedure, so I had to essentially copy the inline
wrapper around __kmalloc.
vmalloc also had its own wrapper for no good reason. This is now gone.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers/slip_user.c')
-rw-r--r-- | arch/um/drivers/slip_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c index edc2de3ee2f4..c0b73c28cff0 100644 --- a/arch/um/drivers/slip_user.c +++ b/arch/um/drivers/slip_user.c | |||
@@ -91,7 +91,7 @@ static int slip_tramp(char **argv, int fd) | |||
91 | pid = err; | 91 | pid = err; |
92 | 92 | ||
93 | output_len = UM_KERN_PAGE_SIZE; | 93 | output_len = UM_KERN_PAGE_SIZE; |
94 | output = um_kmalloc(output_len); | 94 | output = kmalloc(output_len, UM_GFP_KERNEL); |
95 | if(output == NULL){ | 95 | if(output == NULL){ |
96 | printk("slip_tramp : failed to allocate output buffer\n"); | 96 | printk("slip_tramp : failed to allocate output buffer\n"); |
97 | os_kill_process(pid, 1); | 97 | os_kill_process(pid, 1); |