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

Commit 2ef75701 authored by Russell King's avatar Russell King
Browse files

ARM: CPU hotplug: fix abuse of irqdesc->node 



irqdesc's node member is supposed to mark the numa node number for the
interrupt.  Our use of it is non-standard.  Remove this, replacing the
functionality with a test of the affinity mask.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cf6ace16

arch/arm/common/gic.c

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, 
	bit = 1 << (cpu + shift);



	spin_lock(&irq_controller_lock);

	d->node = cpu;

	val = readl_relaxed(reg) & ~mask;

	writel_relaxed(val | bit, reg);

	spin_unlock(&irq_controller_lock);

arch/arm/kernel/irq.c

+2 −8
Original line number Diff line number Diff line
@@ -166,15 +166,9 @@ void migrate_irqs(void) 
		bool affinity_broken = false;



		raw_spin_lock(&desc->lock);

		do {

			if (desc->action == NULL)

				break;



			if (d->node != cpu)

				break;



		if (desc->action != NULL &&

		    cpumask_test_cpu(smp_processor_id(), d->affinity))

			affinity_broken = migrate_one_irq(d);

		} while (0);

		raw_spin_unlock(&desc->lock);



		if (affinity_broken && printk_ratelimit())