diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-21 15:07:56 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-21 15:07:56 +0100 |
commit | ca15af19ac07908c8ca386f6d944a18aa343b868 (patch) | |
tree | 3e2e729a427c1d421c654503f399b83a37e4d098 /arch/arm/kernel/irq.c | |
parent | 5dfc54e087c15f823ee9b6541d2f0f314e69cbed (diff) | |
download | linux-ca15af19ac07908c8ca386f6d944a18aa343b868.tar.gz linux-ca15af19ac07908c8ca386f6d944a18aa343b868.tar.bz2 linux-ca15af19ac07908c8ca386f6d944a18aa343b868.zip |
ARM: CPU hotplug: pass in proper affinity mask on IRQ migration
Now that the GIC takes care of selecting a target interrupt from the
affinity mask, we don't need all this complexity in the core code
anymore. Just detect when we need to break affinity.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/irq.c')
-rw-r--r-- | arch/arm/kernel/irq.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index d7aa5c97877c..ab63c05290e5 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -133,17 +133,15 @@ int __init arch_probe_nr_irqs(void) static bool migrate_one_irq(struct irq_data *d) { - unsigned int cpu = cpumask_any_and(d->affinity, cpu_online_mask); + const struct cpumask *affinity = d->affinity; bool ret = false; - if (cpu >= nr_cpu_ids) { - cpu = cpumask_any(cpu_online_mask); + if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) { + affinity cpu_online_mask; ret = true; } - pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", d->irq, d->node, cpu); - - d->chip->irq_set_affinity(d, cpumask_of(cpu), true); + d->chip->irq_set_affinity(d, affinity, true); return ret; } |