diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-07-15 23:38:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 09:05:38 -0700 |
| commit | e4c4bf9968cb4f0fceb1b8fb54790ccae73caf4e (patch) | |
| tree | fe9892123214821c37a7b615fe52db7f6d46e148 /arch/um/drivers/fd.c | |
| parent | c43990162fc7f9d2f15a12797fdc6f9c0905f704 (diff) | |
| download | blackbird-op-linux-e4c4bf9968cb4f0fceb1b8fb54790ccae73caf4e.tar.gz blackbird-op-linux-e4c4bf9968cb4f0fceb1b8fb54790ccae73caf4e.zip | |
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/fd.c')
| -rw-r--r-- | arch/um/drivers/fd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c index 7f083ec47a4f..39c01ffd45c9 100644 --- a/arch/um/drivers/fd.c +++ b/arch/um/drivers/fd.c @@ -37,7 +37,7 @@ static void *fd_init(char *str, int device, const struct chan_opts *opts) printk("fd_init : couldn't parse file descriptor '%s'\n", str); return(NULL); } - data = um_kmalloc(sizeof(*data)); + data = kmalloc(sizeof(*data), UM_GFP_KERNEL); if(data == NULL) return(NULL); *data = ((struct fd_chan) { .fd = n, .raw = opts->raw }); |
