diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-23 11:18:59 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-23 11:58:14 +0100 |
commit | f31055c18c14eca21f0c4c6e82fc922ef49c9fd3 (patch) | |
tree | 419d39df0fa0a633f03ffdfdbceb60f5f7616b64 | |
parent | c2f7eb8029e23c4f5445340d8fc0d05367538e6d (diff) |
Revert "irqchip: Gic: Support forced affinity setting"v3.10/topic/gic-workaround
This reverts commit 2e020bb03a2db393dc7def211a5e62440db7d0b8 since it
breaks CPU0 hotplug on ARM.
Signed-off-by: Mark Brown <broonie@linaro.org>
-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 4e11218d644e..19ceaa60e0f4 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -246,14 +246,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; |