Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / um / sys-i386 / ldt.c

diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index 69971b78beaf9900a92d27de56117343f05d26c7..5db7737df0ff1bc594856588b592c860a023c006 100644 (file)
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -3,8 +3,6 @@
  * Licensed under the GPL
  */
 
-#include "linux/stddef.h"
-#include "linux/config.h"
 #include "linux/sched.h"
 #include "linux/slab.h"
 #include "linux/types.h"
@@ -168,7 +166,7 @@ static long read_ldt_from_host(void __user * ptr, unsigned long bytecount)
        struct ptrace_ldt ptrace_ldt = (struct ptrace_ldt) {
                        .func = 0,
                        .bytecount = bytecount,
-                       .ptr = (void *)kmalloc(bytecount, GFP_KERNEL)};
+                       .ptr = kmalloc(bytecount, GFP_KERNEL)};
        u32 cpu;
 
        if(ptrace_ldt.ptr == NULL)
@@ -428,7 +426,7 @@ void ldt_get_host_info(void)
                host_ldt_entries = dummy_list;
        else {
                size = (size + 1) * sizeof(dummy_list[0]);
-               host_ldt_entries = (short *)kmalloc(size, GFP_KERNEL);
+               host_ldt_entries = kmalloc(size, GFP_KERNEL);
                if(host_ldt_entries == NULL) {
                        printk("ldt_get_host_info: couldn't allocate host ldt list\n");
                        goto out_free;