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>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index cac01b31ea95..61d3953c7ac9 100644
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -54,7 +54,7 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
                 return;
         }
 
-        output = um_kmalloc(UM_KERN_PAGE_SIZE);
+        output = kmalloc(UM_KERN_PAGE_SIZE, UM_GFP_KERNEL);
         if(output == NULL)
                 printk("etap_change : Failed to allocate output buffer\n");
         read_output(fd, output, UM_KERN_PAGE_SIZE);
@@ -166,7 +166,7 @@ static int etap_open(void *data)
         err = etap_tramp(pri->dev_name, pri->gate_addr, control_fds[0], 
                          control_fds[1], data_fds[0], data_fds[1]);
         output_len = UM_KERN_PAGE_SIZE;
-        output = um_kmalloc(output_len);
+        output = kmalloc(output_len, UM_GFP_KERNEL);
         read_output(control_fds[0], output, output_len);
 
         if(output == NULL)