diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-04-11 12:15:38 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-04-11 12:15:38 +0300 |
| commit | 425b655ce479843abae07bf4dc7c496ca9538a5a (patch) | |
| tree | ca816b68b513b56ca17e154f0fe7bbfd0c7296bf /drivers/irqchip/irq-gic.c | |
| parent | fdb7144ba36ef0c1882df3484cc9dfb7d57b2a26 (diff) | |
| parent | 78223354a64284fe1ef74c5a7900435776fcf2a0 (diff) | |
| download | linux-425b655ce479843abae07bf4dc7c496ca9538a5a.tar.xz | |
Merge tag 'irqchip-core-4.1-2' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v4.1 (round 2) from Jason Cooper
- gic
- Tolerate uni-processor systems better in gic_get_cpumask()
- mvebu
- Handle per-cpu interrupts properly
- Enable PMU interrupts
- Enable wakeup source
- vybrid
- Add MSCM interrupt router
- renesas
- Add PM and wakeup support
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
| -rw-r--r-- | drivers/irqchip/irq-gic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 0b4a4d0238e7..d6d6b74801d4 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -414,7 +414,7 @@ static u8 gic_get_cpumask(struct gic_chip_data *gic) break; } - if (!mask) + if (!mask && num_possible_cpus() > 1) pr_crit("GIC CPU mask not found - kernel will fail to boot.\n"); return mask; |