diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
| commit | 6abdd5f5935fff978f950561f3c5175eb34dad73 (patch) | |
| tree | 6f3ed3a4f4af9e74436ec9355ebf8201357f1c40 /drivers/irqchip/irq-gic.c | |
| parent | net_sched: fix use of uninitialized ethertype variable in cls_flower (diff) | |
| parent | Merge tag 'hwmon-for-linus-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (diff) | |
| download | linux-dev-6abdd5f5935fff978f950561f3c5175eb34dad73.tar.xz linux-dev-6abdd5f5935fff978f950561f3c5175eb34dad73.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
| -rw-r--r-- | drivers/irqchip/irq-gic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index c2cab572c511..390fac59c6bc 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -769,6 +769,13 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) int cpu; unsigned long flags, map = 0; + if (unlikely(nr_cpu_ids == 1)) { + /* Only one CPU? let's do a self-IPI... */ + writel_relaxed(2 << 24 | irq, + gic_data_dist_base(&gic_data[0]) + GIC_DIST_SOFTINT); + return; + } + raw_spin_lock_irqsave(&irq_controller_lock, flags); /* Convert our logical CPU mask into a physical one. */ |