diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-21 14:51:13 +0100 |
---|---|---|
committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-05-24 09:18:59 +0800 |
commit | 2a4673720ce9c008b11bd2639a933b8d488c8ba2 (patch) | |
tree | f0ec848802721176e21754e630925496a6a028e8 /arch/arm/kernel | |
parent | 702605fc0130329896a9c7838225603a609bfe3a (diff) |
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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/irq.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index dbc1f41575b2..3e34b1f0586b 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -175,15 +175,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()) |