diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-07 13:39:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-07 13:39:22 +0200 |
| commit | 37b16beaa92860c378273ccdcc2ccb22c6cee047 (patch) | |
| tree | 4fc7f879c32d11d318f411dbe128d080ed8478f9 /drivers/irqchip/irq-gic.c | |
| parent | 3e46d21285577a8c9e4c37f9b1002e567c440b28 (diff) | |
| parent | a4b4f11b2783ec678cccb4ce7e4ce9665aa04a24 (diff) | |
| download | talos-obmc-linux-37b16beaa92860c378273ccdcc2ccb22c6cee047.tar.gz talos-obmc-linux-37b16beaa92860c378273ccdcc2ccb22c6cee047.zip | |
Merge branch 'perf/urgent' into perf/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
| -rw-r--r-- | drivers/irqchip/irq-gic.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 4300b6606f5e..57d165e026f4 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -246,10 +246,14 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force) { void __iomem *reg = gic_dist_base(d) + GIC_DIST_TARGET + (gic_irq(d) & ~3); - unsigned int shift = (gic_irq(d) % 4) * 8; - unsigned int cpu = cpumask_any_and(mask_val, cpu_online_mask); + unsigned int cpu, shift = (gic_irq(d) % 4) * 8; u32 val, mask, bit; + if (!force) + cpu = cpumask_any_and(mask_val, cpu_online_mask); + else + cpu = cpumask_first(mask_val); + if (cpu >= NR_GIC_CPU_IF || cpu >= nr_cpu_ids) return -EINVAL; |
