Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca15af19 authored by Russell King's avatar Russell King
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5dfc54e0

arch/arm/kernel/irq.c

+4 −6
Original line number Diff line number Diff line
@@ -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;

}