X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Fum%2Fdrivers%2Ffd.c;h=39c01ffd45c92a7cb9d2b9a52fb57a0eb2dea2e7;hb=f3d9071667752e5d419e59f76912ed3fb4a6bb9c;hp=218aa0e9b792b6f0351e084f8640e472ecdf5c9f;hpb=f0eef25339f92f7cd4aeea23d9ae97987a5a1e82;p=linux-2.6-omap-h63xx.git

diff --git a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
index 218aa0e9b79..39c01ffd45c 100644
--- a/arch/um/drivers/fd.c
+++ b/arch/um/drivers/fd.c
@@ -9,7 +9,6 @@
 #include <termios.h>
 #include <errno.h>
 #include "user.h"
-#include "user_util.h"
 #include "chan_user.h"
 #include "os.h"
 #include "um_malloc.h"
@@ -38,7 +37,7 @@ static void *fd_init(char *str, int device, const struct chan_opts *opts)
 		printk("fd_init : couldn't parse file descriptor '%s'\n", str);
 		return(NULL);
 	}
-	data = um_kmalloc(sizeof(*data));
+	data = kmalloc(sizeof(*data), UM_GFP_KERNEL);
 	if(data == NULL) return(NULL);
 	*data = ((struct fd_chan) { .fd  	= n,
 				    .raw  	= opts->raw });