diff options
| author | Milton Miller <miltonm@bga.com> | 2011-05-24 20:34:17 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-26 13:38:59 +1000 |
| commit | 3d1b5e206a4f0ce46f2aa138590738c5d8e118ac (patch) | |
| tree | 23e10e1c4d3a89bdb6c870998e3b4843358e75b8 /arch/powerpc/kernel | |
| parent | 8142f032a90680ed2fb080ca694ffe9509276361 (diff) | |
| download | op-kernel-dev-3d1b5e206a4f0ce46f2aa138590738c5d8e118ac.zip op-kernel-dev-3d1b5e206a4f0ce46f2aa138590738c5d8e118ac.tar.gz | |
powerpc/irq: Always free duplicate IRQ_LEGACY hosts
Since kmem caches are allocated before init_IRQ as noted in 3af259d155
(powerpc: Radix trees are available before init_IRQ), we now call
kmalloc in all cases and can can always call kfree if we are asked
to allocate a duplicate or conflicting IRQ_HOST_MAP_LEGACY host.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index f2fd653..0df2554 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -557,15 +557,8 @@ struct irq_host *irq_alloc_host(struct device_node *of_node, if (revmap_type == IRQ_HOST_MAP_LEGACY) { if (irq_map[0].host != NULL) { raw_spin_unlock_irqrestore(&irq_big_lock, flags); - /* If we are early boot, we can't free the structure, - * too bad... - * this will be fixed once slab is made available early - * instead of the current cruft - */ - if (mem_init_done) { - of_node_put(host->of_node); - kfree(host); - } + of_node_put(host->of_node); + kfree(host); return NULL; } irq_map[0].host = host; |
