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>
This commit is contained in:
committed by
Linus Torvalds
parent
c43990162f
commit
e4c4bf9968
@ -105,7 +105,7 @@ static int need_poll(struct pollfds *polls, int n)
|
||||
if(n <= polls->size)
|
||||
return 0;
|
||||
|
||||
new = um_kmalloc_atomic(n * sizeof(struct pollfd));
|
||||
new = kmalloc(n * sizeof(struct pollfd), UM_GFP_ATOMIC);
|
||||
if(new == NULL){
|
||||
printk("need_poll : failed to allocate new pollfds\n");
|
||||
return -ENOMEM;
|
||||
@ -233,7 +233,7 @@ static struct pollfd *setup_initial_poll(int fd)
|
||||
{
|
||||
struct pollfd *p;
|
||||
|
||||
p = um_kmalloc(sizeof(struct pollfd));
|
||||
p = kmalloc(sizeof(struct pollfd), UM_GFP_KERNEL);
|
||||
if (p == NULL) {
|
||||
printk("setup_initial_poll : failed to allocate poll\n");
|
||||
return NULL;
|
||||
|
Reference in New Issue
Block a user