diff options
| author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2015-01-23 04:25:06 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-28 05:28:10 +0100 |
| commit | 31494cf3532cfee0bf5c913ac9962971aab7b1d4 (patch) | |
| tree | 73ebfdceed8b6920cd867c962712dd7bc69953e4 /arch/powerpc/platforms | |
| parent | powerpc/powernv: Separate function for OPAL IRQ setup (diff) | |
| download | linux-31494cf3532cfee0bf5c913ac9962971aab7b1d4.tar.xz linux-31494cf3532cfee0bf5c913ac9962971aab7b1d4.zip | |
powerpc/powernv: Don't alloc IRQ map if necessary
On PowerNV platform, the OPAL interrupts are exported by firmware
through device-node property (/ibm,opal::opal-interrupts). Under
some extreme circumstances (e.g. simulator), we don't have this
property found from the device tree. For that case, we shouldn't
allocate the interrupt map. Otherwise, slab complains allocating
zero sized memory chunk.
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index 933c7fbd6b54..18fd4e71c9c1 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c @@ -708,11 +708,12 @@ static void __init opal_irq_init(struct device_node *dn) /* Get interrupt property */ irqs = of_get_property(opal_node, "opal-interrupts", &irqlen); - pr_debug("Found %d interrupts reserved for OPAL\n", - irqs ? (irqlen / 4) : 0); + opal_irq_count = irqs ? (irqlen / 4) : 0; + pr_debug("Found %d interrupts reserved for OPAL\n", opal_irq_count); + if (!opal_irq_count) + return; /* Install interrupt handlers */ - opal_irq_count = irqlen / 4; opal_irqs = kzalloc(opal_irq_count * sizeof(unsigned int), GFP_KERNEL); for (i = 0; irqs && i < opal_irq_count; i++, irqs++) { unsigned int irq, virq; |