1 files changed, 6 insertions, 10 deletions

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index fd817e541543..87e18bf2c667 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -3,18 +3,19 @@
  * Licensed under the GPL
  */
 
+#include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <string.h>
 #include <errno.h>
+#include <string.h>
 #include <termios.h>
 #include "chan_user.h"
+#include "kern_constants.h"
 #include "os.h"
-#include "init.h"
+#include "um_malloc.h"
 #include "user.h"
 #include "xterm.h"
-#include "kern_constants.h"
 
 struct xterm_chan {
         int pid;
@@ -29,7 +30,7 @@ static void *xterm_init(char *str, int device, const struct chan_opts *opts)
 {
         struct xterm_chan *data;
 
-        data = malloc(sizeof(*data));
+        data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
         if (data == NULL)
                 return NULL;
         *data = ((struct xterm_chan) { .pid             = -1,
@@ -207,11 +208,6 @@ static void xterm_close(int fd, void *d)
         os_close_file(fd);
 }
 
-static void xterm_free(void *d)
-{
-        free(d);
-}
-
 const struct chan_ops xterm_ops = {
         .type           = "xterm",
         .init           = xterm_init,
@@ -221,6 +217,6 @@ const struct chan_ops xterm_ops = {
         .write          = generic_write,
         .console_write  = generic_console_write,
         .window_size    = generic_window_size,
-        .free           = xterm_free,
+        .free           = generic_free,
         .winch          = 1,
 };