17 files changed, 28 insertions, 24 deletions

diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index 025764089ac8..cfeb3f4a44af 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -11,6 +11,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 #include "chan_user.h"
+#include "kern_constants.h"
 #include "os.h"
 #include "um_malloc.h"
 #include "user.h"
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)
diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c
index f23c109a055c..f8e85e0bdace 100644
--- a/arch/um/drivers/daemon_user.c
+++ b/arch/um/drivers/daemon_user.c
@@ -34,7 +34,7 @@ static struct sockaddr_un *new_addr(void *name, int len)
 {
         struct sockaddr_un *sun;
 
-        sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
+        sun = uml_kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
         if (sun == NULL) {
                 printk(UM_KERN_ERR "new_addr: allocation of sockaddr_un "
                        "failed\n");
@@ -83,7 +83,7 @@ static int connect_to_switch(struct daemon_data *pri)
                 goto out_close;
         }
 
-        sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
+        sun = uml_kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
         if (sun == NULL) {
                 printk(UM_KERN_ERR "new_addr: allocation of sockaddr_un "
                        "failed\n");
diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 0a2bb5b64b82..f5a981a16240 100644
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -40,7 +40,7 @@ static void *fd_init(char *str, int device, const struct chan_opts *opts)
                 return NULL;
         }
 
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
         if (data == NULL)
                 return NULL;
 
diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
index 5f647d7a7292..ee19e91568a2 100644
--- a/arch/um/drivers/mcast_user.c
+++ b/arch/um/drivers/mcast_user.c
@@ -15,6 +15,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <netinet/in.h>
+#include "kern_constants.h"
 #include "mcast.h"
 #include "net_user.h"
 #include "um_malloc.h"
@@ -24,7 +25,7 @@ static struct sockaddr_in *new_addr(char *addr, unsigned short port)
 {
         struct sockaddr_in *sin;
 
-        sin = kmalloc(sizeof(struct sockaddr_in), UM_GFP_KERNEL);
+        sin = uml_kmalloc(sizeof(struct sockaddr_in), UM_GFP_KERNEL);
         if (sin == NULL) {
                 printk(UM_KERN_ERR "new_addr: allocation of sockaddr_in "
                        "failed\n");
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index abf2653f5517..9415dd9e63ef 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -222,7 +222,7 @@ static void change(char *dev, char *what, unsigned char *addr,
                 netmask[2], netmask[3]);
 
         output_len = UM_KERN_PAGE_SIZE;
-        output = kmalloc(output_len, UM_GFP_KERNEL);
+        output = uml_kmalloc(output_len, UM_GFP_KERNEL);
         if (output == NULL)
                 printk(UM_KERN_ERR "change : failed to allocate output "
                        "buffer\n");
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index d269ca387f10..b49bf56a56aa 100644
--- a/arch/um/drivers/port_user.c
+++ b/arch/um/drivers/port_user.c
@@ -47,7 +47,7 @@ static void *port_init(char *str, int device, const struct chan_opts *opts)
         if (kern_data == NULL)
                 return NULL;
 
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
         if (data == NULL)
                 goto err;
 
diff --git a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
index 49c79dda6046..1113911dcb2b 100644
--- a/arch/um/drivers/pty.c
+++ b/arch/um/drivers/pty.c
@@ -29,7 +29,7 @@ static void *pty_chan_init(char *str, int device, const struct chan_opts *opts)
 {
         struct pty_chan *data;
 
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
         if (data == NULL)
                 return NULL;
 
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 8b80505a3fb0..a1c2d2c98a94 100644
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -96,7 +96,7 @@ static int slip_tramp(char **argv, int fd)
         pid = err;
 
         output_len = UM_KERN_PAGE_SIZE;
-        output = kmalloc(output_len, UM_GFP_KERNEL);
+        output = uml_kmalloc(output_len, UM_GFP_KERNEL);
         if (output == NULL) {
                 printk(UM_KERN_ERR "slip_tramp : failed to allocate output "
                        "buffer\n");
diff --git a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c
index c930fedc5172..495858a090e4 100644
--- a/arch/um/drivers/tty.c
+++ b/arch/um/drivers/tty.c
@@ -29,7 +29,7 @@ static void *tty_chan_init(char *str, int device, const struct chan_opts *opts)
         }
         str++;
 
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
         if (data == NULL)
                 return NULL;
         *data = ((struct tty_chan) { .dev       = str,
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index 8a1c18a9b240..da2caa5a21ef 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -30,7 +30,7 @@ static void *xterm_init(char *str, int device, const struct chan_opts *opts)
 {
         struct xterm_chan *data;
 
-        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
+        data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
         if (data == NULL)
                 return NULL;
         *data = ((struct xterm_chan) { .pid             = -1,
diff --git a/arch/um/include/um_malloc.h b/arch/um/include/um_malloc.h
index 0ad17cb83d96..c554d706d106 100644
--- a/arch/um/include/um_malloc.h
+++ b/arch/um/include/um_malloc.h
@@ -8,15 +8,12 @@
 
 #include "kern_constants.h"
 
-extern void *__kmalloc(int size, int flags);
-static inline void *kmalloc(int size, int flags)
-{
-        return __kmalloc(size, flags);
-}
-
+extern void *uml_kmalloc(int size, int flags);
 extern void kfree(const void *ptr);
 
 extern void *vmalloc(unsigned long size);
 extern void vfree(void *ptr);
 
 #endif /* __UM_MALLOC_H__ */
+
+
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 2eea1ff235e6..b0ee64622ff7 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -375,3 +375,8 @@ pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
         return pmd;
 }
 #endif
+
+void *uml_kmalloc(int size, int flags)
+{
+        return kmalloc(size, flags);
+}
diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index 6fb0b174f538..cc72cb2c1af6 100644
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -52,7 +52,7 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
                 return;
         }
 
-        output = kmalloc(UM_KERN_PAGE_SIZE, UM_GFP_KERNEL);
+        output = uml_kmalloc(UM_KERN_PAGE_SIZE, UM_GFP_KERNEL);
         if (output == NULL)
                 printk(UM_KERN_ERR "etap_change : Failed to allocate output "
                        "buffer\n");
@@ -165,7 +165,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 = kmalloc(output_len, UM_GFP_KERNEL);
+        output = uml_kmalloc(output_len, UM_GFP_KERNEL);
         read_output(control_fds[0], output, output_len);
 
         if (output == NULL)
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index f25c29a12d00..74ca7aabf4e1 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -71,8 +71,8 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv)
         data.pre_data = pre_data;
         data.argv = argv;
         data.fd = fds[1];
-        data.buf = __cant_sleep() ? kmalloc(PATH_MAX, UM_GFP_ATOMIC) :
-                                        kmalloc(PATH_MAX, UM_GFP_KERNEL);
+        data.buf = __cant_sleep() ? uml_kmalloc(PATH_MAX, UM_GFP_ATOMIC) :
+                                        uml_kmalloc(PATH_MAX, UM_GFP_KERNEL);
         pid = clone(helper_child, (void *) sp, CLONE_VM, &data);
         if (pid < 0) {
                 ret = -errno;
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index abb9b0ffd960..eee69b9f52c9 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -199,7 +199,7 @@ void *__wrap_malloc(int size)
                 return __real_malloc(size);
         else if (size <= UM_KERN_PAGE_SIZE)
                 /* finding contiguous pages can be hard*/
-                ret = kmalloc(size, UM_GFP_KERNEL);
+                ret = uml_kmalloc(size, UM_GFP_KERNEL);
         else ret = vmalloc(size);
 
         /*
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index abf47a7c4abd..0578481983c4 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -109,7 +109,7 @@ static int need_poll(struct pollfds *polls, int n)
         if (n <= polls->size)
                 return 0;
 
-        new = kmalloc(n * sizeof(struct pollfd), UM_GFP_ATOMIC);
+        new = uml_kmalloc(n * sizeof(struct pollfd), UM_GFP_ATOMIC);
         if (new == NULL) {
                 printk(UM_KERN_ERR "need_poll : failed to allocate new "
                        "pollfds\n");
@@ -243,7 +243,7 @@ static struct pollfd *setup_initial_poll(int fd)
 {
         struct pollfd *p;
 
-        p = kmalloc(sizeof(struct pollfd), UM_GFP_KERNEL);
+        p = uml_kmalloc(sizeof(struct pollfd), UM_GFP_KERNEL);
         if (p == NULL) {
                 printk(UM_KERN_ERR "setup_initial_poll : failed to allocate "
                        "poll\n");