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>

1 files changed, 2 insertions, 8 deletions

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 83bbad03fcc6..d7aa5c97877c 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())