powerpc: Change free_bootmem() to kfree()
authorJoonSoo Kim <js1304@gmail.com>
Mon, 12 Nov 2012 06:40:33 +0000 (06:40 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 15 Nov 2012 02:01:16 +0000 (13:01 +1100)
commit ea96025a('Don't use alloc_bootmem() in init_IRQ() path')
changed alloc_bootmem() to kzalloc(),
but missed to change free_bootmem() to kfree().
So correct it.

Signed-off-by: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/82xx/pq2ads-pci-pic.c

index 328d221..74861a7 100644 (file)
@@ -16,7 +16,6 @@
 #include <linux/spinlock.h>
 #include <linux/irq.h>
 #include <linux/types.h>
-#include <linux/bootmem.h>
 #include <linux/slab.h>
 
 #include <asm/io.h>
@@ -149,7 +148,7 @@ int __init pq2ads_pci_init_irq(void)
        priv->regs = of_iomap(np, 0);
        if (!priv->regs) {
                printk(KERN_ERR "Cannot map PCI PIC registers.\n");
-               goto out_free_bootmem;
+               goto out_free_kmalloc;
        }
 
        /* mask all PCI interrupts */
@@ -171,9 +170,8 @@ int __init pq2ads_pci_init_irq(void)
 
 out_unmap_regs:
        iounmap(priv->regs);
-out_free_bootmem:
-       free_bootmem((unsigned long)priv,
-                    sizeof(struct pq2ads_pci_pic));
+out_free_kmalloc:
+       kfree(priv);
        of_node_put(np);
 out_unmap_irq:
        irq_dispose_mapping(irq);