30 files changed, 40 insertions, 40 deletions

diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
index a11fb9a40c04..2c37b70b17ab 100644
--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
@@ -423,7 +423,7 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
+        as = kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
                 /*
                  * XXX - this is a tiny bit broken, when we consider BSD
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index a786f769035d..71257e3d513f 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -353,7 +353,7 @@ int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
                 }
                 if (c_id(&excd) == 0x80) { /* loader */
                         if (!ec->loader) {
-                                ec->loader = (loader_t)kmalloc(c_len(&excd),
+                                ec->loader = kmalloc(c_len(&excd),
                                                                GFP_KERNEL);
                                 if (ec->loader)
                                         ecard_readbytes(ec->loader, ec,
diff --git a/arch/arm26/kernel/ecard.c b/arch/arm26/kernel/ecard.c
index 43dd41be71fb..9dbc17247c6f 100644
--- a/arch/arm26/kernel/ecard.c
+++ b/arch/arm26/kernel/ecard.c
@@ -215,7 +215,7 @@ int ecard_readchunk(struct in_chunk_dir *cd, ecard_t *ec, int id, int num)
                 }
                 if (c_id(&excd) == 0x80) { /* loader */
                         if (!ec->loader) {
-                                ec->loader = (loader_t)kmalloc(c_len(&excd),
+                                ec->loader = kmalloc(c_len(&excd),
                                                                GFP_KERNEL);
                                 if (ec->loader)
                                         ecard_readbytes(ec->loader, ec,
diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c
index d87d68b77d66..d53382c83bf9 100644
--- a/arch/arm26/kernel/irq.c
+++ b/arch/arm26/kernel/irq.c
@@ -545,7 +545,7 @@ int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_
             (irq_flags & IRQF_SHARED && !dev_id))
                 return -EINVAL;
 
-        action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);
+        action = kmalloc(sizeof(struct irqaction), GFP_KERNEL);
         if (!action)
                 return -ENOMEM;
 
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index 4fa81abab0c7..ffade19a14e6 100644
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -516,7 +516,7 @@ static int __init init_axis_flash(void)
 #else
                 struct mtd_info *mtd_ram;
 
-                mtd_ram = (struct mtd_info *)kmalloc(sizeof(struct mtd_info),
+                mtd_ram = kmalloc(sizeof(struct mtd_info),
                                                      GFP_KERNEL);
                 if (!mtd_ram) {
                         panic("axisflashmap couldn't allocate memory for "
diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c
index fcba6632ed7b..9aba18b931dd 100644
--- a/arch/cris/arch-v10/drivers/gpio.c
+++ b/arch/cris/arch-v10/drivers/gpio.c
@@ -440,7 +440,7 @@ gpio_open(struct inode *inode, struct file *filp)
         if (p > GPIO_MINOR_LAST)
                 return -EINVAL;
 
-        priv = (struct gpio_private *)kmalloc(sizeof(struct gpio_private), 
+        priv = kmalloc(sizeof(struct gpio_private),
                                               GFP_KERNEL);
 
         if (!priv)
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 41952320e00a..5180d45412fc 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -427,7 +427,7 @@ static int __init init_axis_flash(void)
 #else
                 struct mtd_info *mtd_ram;
 
-                mtd_ram = (struct mtd_info *)kmalloc(sizeof(struct mtd_info),
+                mtd_ram = kmalloc(sizeof(struct mtd_info),
                                                      GFP_KERNEL);
                 if (!mtd_ram) {
                         panic("axisflashmap couldn't allocate memory for "
diff --git a/arch/cris/arch-v32/drivers/gpio.c b/arch/cris/arch-v32/drivers/gpio.c
index c3f876b4da6b..08d36f0955c6 100644
--- a/arch/cris/arch-v32/drivers/gpio.c
+++ b/arch/cris/arch-v32/drivers/gpio.c
@@ -423,7 +423,7 @@ gpio_open(struct inode *inode, struct file *filp)
         if (p > GPIO_MINOR_LAST)
                 return -EINVAL;
 
-        priv = (struct gpio_private *)kmalloc(sizeof(struct gpio_private),
+        priv = kmalloc(sizeof(struct gpio_private),
                                               GFP_KERNEL);
 
         if (!priv)
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index 99e59b3eacf8..7cd6ac803409 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -686,7 +686,7 @@ keep_debug_flags(unsigned long oldccs, unsigned long oldspc,
 int __init
 cris_init_signal(void)
 {
-        u16* data = (u16*)kmalloc(PAGE_SIZE, GFP_KERNEL);
+        u16* data = kmalloc(PAGE_SIZE, GFP_KERNEL);
 
         /* This is movu.w __NR_sigreturn, r9; break 13; */
         data[0] = 0x9c5f;
diff --git a/arch/cris/kernel/profile.c b/arch/cris/kernel/profile.c
index 69c52189f044..f60ab785f235 100644
--- a/arch/cris/kernel/profile.c
+++ b/arch/cris/kernel/profile.c
@@ -59,7 +59,7 @@ static int
 __init init_cris_profile(void)
 {
   struct proc_dir_entry *entry;
-  sample_buffer = (char*)kmalloc(SAMPLE_BUFFER_SIZE, GFP_KERNEL);
+  sample_buffer = kmalloc(SAMPLE_BUFFER_SIZE, GFP_KERNEL);
   sample_buffer_pos = sample_buffer;
   entry = create_proc_entry("system_profile", S_IWUSR | S_IRUGO, NULL);
   if (entry) {
diff --git a/arch/h8300/kernel/ints.c b/arch/h8300/kernel/ints.c
index 1bfc77e391d5..587ef7f4fcc7 100644
--- a/arch/h8300/kernel/ints.c
+++ b/arch/h8300/kernel/ints.c
@@ -141,7 +141,7 @@ int request_irq(unsigned int irq,
                 return -EBUSY;
 
         if (use_kmalloc)
-                irq_handle = (irq_handler_t *)kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
+                irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
         else {
                 /* use bootmem allocater */
                 irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
diff --git a/arch/h8300/platform/h8s/ints.c b/arch/h8300/platform/h8s/ints.c
index 270440de4610..567f681ddfec 100644
--- a/arch/h8300/platform/h8s/ints.c
+++ b/arch/h8300/platform/h8s/ints.c
@@ -176,7 +176,7 @@ int request_irq(unsigned int irq,
         }               
 
         if (use_kmalloc)
-                irq_handle = (irq_handler_t *)kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
+                irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
         else {
                 /* use bootmem allocater */
                 irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index a97847da9ed5..b75cff25de4b 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -1604,7 +1604,7 @@ static int do_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *       as;
 
-        as = (struct apm_user *)kmalloc(sizeof(*as), GFP_KERNEL);
+        as = kmalloc(sizeof(*as), GFP_KERNEL);
         if (as == NULL) {
                 printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
                        sizeof(*as));
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 462ea178f49a..33367996d72d 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -189,7 +189,7 @@ static void print_pci_topology(struct seq_file *s)
         int e;
 
         for (sz = PAGE_SIZE; sz < 16 * PAGE_SIZE; sz += PAGE_SIZE) {
-                if (!(p = (char *)kmalloc(sz, GFP_KERNEL)))
+                if (!(p = kmalloc(sz, GFP_KERNEL)))
                         break;
                 e = ia64_sn_ioif_get_pci_topology(__pa(p), sz);
                 if (e == SALRET_OK)
diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c
index b54ef1726c55..46b7d6035aab 100644
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
@@ -59,7 +59,7 @@ static struct vm_struct *get_io_area(unsigned long size)
         unsigned long addr;
         struct vm_struct **p, *tmp, *area;
 
-        area = (struct vm_struct *)kmalloc(sizeof(*area), GFP_KERNEL);
+        area = kmalloc(sizeof(*area), GFP_KERNEL);
         if (!area)
                 return NULL;
         addr = KMAP_START;
diff --git a/arch/mips/kernel/apm.c b/arch/mips/kernel/apm.c
index 528e731049c1..ba16d07588cb 100644
--- a/arch/mips/kernel/apm.c
+++ b/arch/mips/kernel/apm.c
@@ -356,7 +356,7 @@ static int apm_open(struct inode * inode, struct file * filp)
 {
         struct apm_user *as;
 
-        as = (struct apm_user *)kzalloc(sizeof(*as), GFP_KERNEL);
+        as = kzalloc(sizeof(*as), GFP_KERNEL);
         if (as) {
                 /*
                  * XXX - this is a tiny bit broken, when we consider BSD
diff --git a/arch/parisc/hpux/sys_hpux.c b/arch/parisc/hpux/sys_hpux.c
index d88309209f56..04c2ff444396 100644
--- a/arch/parisc/hpux/sys_hpux.c
+++ b/arch/parisc/hpux/sys_hpux.c
@@ -475,7 +475,7 @@ int hpux_sysfs(int opcode, unsigned long arg1, unsigned long arg2)
                 printk(KERN_DEBUG "len of arg1 = %d\n", len);
                 if (len == 0)
                         return 0;
-                fsname = (char *) kmalloc(len, GFP_KERNEL);
+                fsname = kmalloc(len, GFP_KERNEL);
                 if ( !fsname ) {
                         printk(KERN_DEBUG "failed to kmalloc fsname\n");
                         return 0;
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index 920bdbf8404f..c10ab47d81fa 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -343,7 +343,7 @@ void unwind_frame_init_from_blocked_task(struct unwind_frame_info *info, struct
         struct pt_regs *r = &t->thread.regs;
         struct pt_regs *r2;
 
-        r2 = (struct pt_regs *)kmalloc(sizeof(struct pt_regs), GFP_KERNEL);
+        r2 = kmalloc(sizeof(struct pt_regs), GFP_KERNEL);
         if (!r2)
                 return;
         *r2 = *r;
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 6960f090991e..869cebbba967 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -505,7 +505,7 @@ static int nvram_scan_partitions(void)
                 return -ENODEV;
         total_size = ppc_md.nvram_size();
         
-        header = (char *) kmalloc(NVRAM_HEADER_LEN, GFP_KERNEL);
+        header = kmalloc(NVRAM_HEADER_LEN, GFP_KERNEL);
         if (!header) {
                 printk(KERN_ERR "nvram_scan_partitions: Failed kmalloc\n");
                 return -ENOMEM;
@@ -574,7 +574,7 @@ static int __init nvram_init(void)
         }
         
         /* initialize our anchor for the nvram partition list */
-        nvram_part = (struct nvram_partition *) kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
+        nvram_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
         if (!nvram_part) {
                 printk(KERN_ERR "nvram_init: Failed kmalloc\n");
                 return -ENOMEM;
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 8336deafc624..2847cd51a2d7 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -670,7 +670,7 @@ pcibios_make_OF_bus_map(void)
         struct pci_controller* hose;
         struct property *map_prop;
 
-        pci_to_OF_bus_map = (u8*)kmalloc(pci_bus_count, GFP_KERNEL);
+        pci_to_OF_bus_map = kmalloc(pci_bus_count, GFP_KERNEL);
         if (!pci_to_OF_bus_map) {
                 printk(KERN_ERR "Can't allocate OF bus map !\n");
                 return;
diff --git a/arch/powerpc/mm/imalloc.c b/arch/powerpc/mm/imalloc.c
index add8c1a9af68..c831815c31f0 100644
--- a/arch/powerpc/mm/imalloc.c
+++ b/arch/powerpc/mm/imalloc.c
@@ -138,7 +138,7 @@ static struct vm_struct * split_im_region(unsigned long v_addr,
         struct vm_struct *vm2 = NULL;
         struct vm_struct *new_vm = NULL;
         
-        vm1 = (struct vm_struct *) kmalloc(sizeof(*vm1), GFP_KERNEL);
+        vm1 = kmalloc(sizeof(*vm1), GFP_KERNEL);
         if (vm1 == NULL) {
                 printk(KERN_ERR "%s() out of memory\n", __FUNCTION__);
                 return NULL;
@@ -172,7 +172,7 @@ static struct vm_struct * split_im_region(unsigned long v_addr,
                  * uppermost remainder, and use existing parent one for the
                  * lower remainder of parent range
                  */
-                vm2 = (struct vm_struct *) kmalloc(sizeof(*vm2), GFP_KERNEL);
+                vm2 = kmalloc(sizeof(*vm2), GFP_KERNEL);
                 if (vm2 == NULL) {
                         printk(KERN_ERR "%s() out of memory\n", __FUNCTION__);
                         kfree(vm1);
@@ -206,7 +206,7 @@ static struct vm_struct * __add_new_im_area(unsigned long req_addr,
                         break;
         }
         
-        area = (struct vm_struct *) kmalloc(sizeof(*area), GFP_KERNEL);
+        area = kmalloc(sizeof(*area), GFP_KERNEL);
         if (!area)
                 return NULL;
         area->flags = 0;
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index b6b462d3c604..f2bae04424f8 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -153,7 +153,7 @@ pci_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
                         return piar;
                 }
         }
-        piar = (struct pci_io_addr_range *)kmalloc(sizeof(struct pci_io_addr_range), GFP_ATOMIC);
+        piar = kmalloc(sizeof(struct pci_io_addr_range), GFP_ATOMIC);
         if (!piar)
                 return NULL;
 
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c
index 709952c25f29..06b84c372e58 100644
--- a/arch/ppc/8260_io/fcc_enet.c
+++ b/arch/ppc/8260_io/fcc_enet.c
@@ -1892,10 +1892,10 @@ init_fcc_param(fcc_info_t *fip, struct net_device *dev,
         /* Allocate space for the buffer descriptors from regular memory.
          * Initialize base addresses for the buffer descriptors.
          */
-        cep->rx_bd_base = (cbd_t *)kmalloc(sizeof(cbd_t) * RX_RING_SIZE,
+        cep->rx_bd_base = kmalloc(sizeof(cbd_t) * RX_RING_SIZE,
                         GFP_KERNEL | GFP_DMA);
         ep->fen_genfcc.fcc_rbase = __pa(cep->rx_bd_base);
-        cep->tx_bd_base = (cbd_t *)kmalloc(sizeof(cbd_t) * TX_RING_SIZE,
+        cep->tx_bd_base = kmalloc(sizeof(cbd_t) * TX_RING_SIZE,
                         GFP_KERNEL | GFP_DMA);
         ep->fen_genfcc.fcc_tbase = __pa(cep->tx_bd_base);
 
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c
index c71ef3c2e7bf..b7bb5f0b3c5f 100644
--- a/arch/ppc/8xx_io/cs4218_tdm.c
+++ b/arch/ppc/8xx_io/cs4218_tdm.c
@@ -2601,7 +2601,7 @@ int __init tdm8xx_sound_init(void)
         /* Initialize beep stuff */
         orig_mksound = kd_mksound;
         kd_mksound = cs_mksound;
-        beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
+        beep_buf = kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL);
         if (beep_buf == NULL)
                 printk(KERN_WARNING "dmasound: no memory for "
                        "beep buffer\n");
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index ef5266fbce62..bb57bc0e3fc8 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -191,13 +191,13 @@ debug_areas_alloc(int pages_per_area, int nr_areas)
         debug_entry_t*** areas;
         int i,j;
 
-        areas = (debug_entry_t ***) kmalloc(nr_areas *
+        areas = kmalloc(nr_areas *
                                         sizeof(debug_entry_t**),
                                         GFP_KERNEL);
         if (!areas)
                 goto fail_malloc_areas;
         for (i = 0; i < nr_areas; i++) {
-                areas[i] = (debug_entry_t**) kmalloc(pages_per_area *
+                areas[i] = kmalloc(pages_per_area *
                                 sizeof(debug_entry_t*),GFP_KERNEL);
                 if (!areas[i]) {
                         goto fail_malloc_areas2;
@@ -242,7 +242,7 @@ debug_info_alloc(char *name, int pages_per_area, int nr_areas, int buf_size,
 
         /* alloc everything */
 
-        rc = (debug_info_t*) kmalloc(sizeof(debug_info_t), GFP_KERNEL);
+        rc = kmalloc(sizeof(debug_info_t), GFP_KERNEL);
         if(!rc)
                 goto fail_malloc_rc;
         rc->active_entries = kcalloc(nr_areas, sizeof(int), GFP_KERNEL);
@@ -634,7 +634,7 @@ found:
                 rc = -ENOMEM;
                 goto out;
         }
-        p_info = (file_private_info_t *) kmalloc(sizeof(file_private_info_t),
+        p_info = kmalloc(sizeof(file_private_info_t),
                                                 GFP_KERNEL);
         if(!p_info){
                 if(debug_info_snapshot)
diff --git a/arch/s390/kernel/s390_ext.c b/arch/s390/kernel/s390_ext.c
index 4faf96f8a834..bc5beaa8f98e 100644
--- a/arch/s390/kernel/s390_ext.c
+++ b/arch/s390/kernel/s390_ext.c
@@ -37,7 +37,7 @@ int register_external_interrupt(__u16 code, ext_int_handler_t handler)
         ext_int_info_t *p;
         int index;
 
-        p = (ext_int_info_t *) kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC);
+        p = kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC);
         if (p == NULL)
                 return -ENOMEM;
         p->code = code;
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index c8cb211b9072..5b4841d067c1 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -425,7 +425,7 @@ int request_fast_irq(unsigned int irq,
         }
         
         if (action == NULL)
-            action = (struct irqaction *)kmalloc(sizeof(struct irqaction),
+            action = kmalloc(sizeof(struct irqaction),
                                                  GFP_ATOMIC);
         
         if (!action) { 
@@ -528,7 +528,7 @@ int request_irq(unsigned int irq,
         }
         
         if (action == NULL)
-                action = (struct irqaction *)kmalloc(sizeof(struct irqaction),
+                action = kmalloc(sizeof(struct irqaction),
                                                      GFP_ATOMIC);
         
         if (!action) { 
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index cf1b8baa57ea..0e27e226e0e2 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -327,7 +327,7 @@ int sun4d_request_irq(unsigned int irq,
         }
         
         if (action == NULL)
-                action = (struct irqaction *)kmalloc(sizeof(struct irqaction),
+                action = kmalloc(sizeof(struct irqaction),
                                                      GFP_ATOMIC);
         
         if (!action) { 
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c
index 4446f66590fa..2ebc2c051383 100644
--- a/arch/sparc64/kernel/sys_sunos32.c
+++ b/arch/sparc64/kernel/sys_sunos32.c
@@ -1055,7 +1055,7 @@ asmlinkage int sunos_msgsys(int op, u32 arg1, u32 arg2, u32 arg3, u32 arg4)
                 break;
         case 2:
                 rval = -EFAULT;
-                kmbuf = (struct msgbuf *)kmalloc(sizeof(struct msgbuf) + arg3,
+                kmbuf = kmalloc(sizeof(struct msgbuf) + arg3,
                                                  GFP_KERNEL);
                 if (!kmbuf)
                         break;
@@ -1078,7 +1078,7 @@ asmlinkage int sunos_msgsys(int op, u32 arg1, u32 arg2, u32 arg3, u32 arg4)
                 break;
         case 3:
                 rval = -EFAULT;
-                kmbuf = (struct msgbuf *)kmalloc(sizeof(struct msgbuf) + arg3,
+                kmbuf = kmalloc(sizeof(struct msgbuf) + arg3,
                                                  GFP_KERNEL);
                 if (!kmbuf || sunos_msgbuf_get((struct msgbuf32 __user *)(unsigned long)arg2,
                                                kmbuf, arg3))
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index 49057d8bc668..5db7737df0ff 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -166,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)
@@ -426,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;