diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-23 12:13:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-23 12:13:00 +0100 |
| commit | a6bb81e8c1cc89338100d6c4b16445af87c5171d (patch) | |
| tree | 953268470e029a9778222506c0c911afa2330e31 | |
| parent | 2582bbfbcd5f2c02319bff0a4dfa971909d69063 (diff) | |
| parent | cdb2f0ff6ccb45ed2040f74533bd3fbb386d01b9 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-rt-preview-14.06
| -rw-r--r-- | drivers/irqchip/irq-gic.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index e0a42097bd54..65bc83747f66 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -247,14 +247,10 @@ 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 cpu, shift = (gic_irq(d) % 4) * 8; + unsigned int shift = (gic_irq(d) % 4) * 8; + unsigned int cpu = cpumask_any_and(mask_val, cpu_online_mask); 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; |