Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[karo-tx-linux.git] / arch / um / drivers / fd.c

diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 207b0444c9d9e6901b498843f9723b562490edc6..f5a981a16240e4d8dd92afca3fb710d9d4d84588 100644 (file)
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -1,19 +1,18 @@
-/* 
+/*
  * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
  * Licensed under the GPL
  */
 
-#include <stddef.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <errno.h>
 #include <termios.h>
-#include <unistd.h>
 #include "chan_user.h"
+#include "kern_constants.h"
+#include "os.h"
 #include "um_malloc.h"
 #include "user.h"
-#include "os.h"
-#include "kern_constants.h"
 
 struct fd_chan {
        int fd;
@@ -41,8 +40,8 @@ static void *fd_init(char *str, int device, const struct chan_opts *opts)
                return NULL;
        }
 
-       data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
-       if(data == NULL)
+       data = uml_kmalloc(sizeof(*data), UM_GFP_KERNEL);
+       if (data == NULL)
                return NULL;
 
        *data = ((struct fd_chan) { .fd         = n,