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>
This commit is contained in:
Родитель
a53fd61ac2
Коммит
03737439d8
|
@ -16,7 +16,6 @@
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
#include <linux/irq.h>
|
#include <linux/irq.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/bootmem.h>
|
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
@ -149,7 +148,7 @@ int __init pq2ads_pci_init_irq(void)
|
||||||
priv->regs = of_iomap(np, 0);
|
priv->regs = of_iomap(np, 0);
|
||||||
if (!priv->regs) {
|
if (!priv->regs) {
|
||||||
printk(KERN_ERR "Cannot map PCI PIC registers.\n");
|
printk(KERN_ERR "Cannot map PCI PIC registers.\n");
|
||||||
goto out_free_bootmem;
|
goto out_free_kmalloc;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* mask all PCI interrupts */
|
/* mask all PCI interrupts */
|
||||||
|
@ -171,9 +170,8 @@ int __init pq2ads_pci_init_irq(void)
|
||||||
|
|
||||||
out_unmap_regs:
|
out_unmap_regs:
|
||||||
iounmap(priv->regs);
|
iounmap(priv->regs);
|
||||||
out_free_bootmem:
|
out_free_kmalloc:
|
||||||
free_bootmem((unsigned long)priv,
|
kfree(priv);
|
||||||
sizeof(struct pq2ads_pci_pic));
|
|
||||||
of_node_put(np);
|
of_node_put(np);
|
||||||
out_unmap_irq:
|
out_unmap_irq:
|
||||||
irq_dispose_mapping(irq);
|
irq_dispose_mapping(irq);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче