summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-07-21 14:51:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-07-21 15:00:27 +0100
commit2ef75701d1711a1feee2a82b42a2597ddc05f88b (patch)
tree376c474932009c459975c9d3865003834f021ad8 /arch/arm/kernel
parentcf6ace16a3cd8b728fb0afa68368fd40bbeae19f (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.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 83bbad03fcc..d7aa5c97877 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -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())