diff options
author | JoonSoo Kim <js1304@gmail.com> | 2012-11-12 01:40:33 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 21:01:16 -0500 |
commit | 03737439d83f4214b98a391f5ef9709b8d15af02 (patch) | |
tree | c85143190b05f3379486f5e224ae84452a266376 /arch/powerpc | |
parent | a53fd61ac2f411745471c1c877d5e072fbbf0e5c (diff) |
powerpc: Change free_bootmem() to kfree()
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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c index 328d221fd1c0..74861a7fb807 100644 --- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c +++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | #include <linux/bootmem.h> | ||
20 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
21 | 20 | ||
22 | #include <asm/io.h> | 21 | #include <asm/io.h> |
@@ -149,7 +148,7 @@ int __init pq2ads_pci_init_irq(void) | |||
149 | priv->regs = of_iomap(np, 0); | 148 | priv->regs = of_iomap(np, 0); |
150 | if (!priv->regs) { | 149 | if (!priv->regs) { |
151 | printk(KERN_ERR "Cannot map PCI PIC registers.\n"); | 150 | printk(KERN_ERR "Cannot map PCI PIC registers.\n"); |
152 | goto out_free_bootmem; | 151 | goto out_free_kmalloc; |
153 | } | 152 | } |
154 | 153 | ||
155 | /* mask all PCI interrupts */ | 154 | /* mask all PCI interrupts */ |
@@ -171,9 +170,8 @@ int __init pq2ads_pci_init_irq(void) | |||
171 | 170 | ||
172 | out_unmap_regs: | 171 | out_unmap_regs: |
173 | iounmap(priv->regs); | 172 | iounmap(priv->regs); |
174 | out_free_bootmem: | 173 | out_free_kmalloc: |
175 | free_bootmem((unsigned long)priv, | 174 | kfree(priv); |
176 | sizeof(struct pq2ads_pci_pic)); | ||
177 | of_node_put(np); | 175 | of_node_put(np); |
178 | out_unmap_irq: | 176 | out_unmap_irq: |
179 | irq_dispose_mapping(irq); | 177 | irq_dispose_mapping(irq); |