Skip to content

Commit

Permalink
ARM: CPU hotplug: pass in proper affinity mask on IRQ migration
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King committed Jul 21, 2011
1 parent 5dfc54e commit ca15af1
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/arm/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit ca15af1

Please sign in to comment.