From: Russell King Date: Thu, 21 Jul 2011 13:51:13 +0000 (+0100) Subject: ARM: CPU hotplug: fix abuse of irqdesc->node X-Git-Tag: v3.0.35-fsl~983 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=72f8ee44aac5224a8ae19feb1adfb1078de1db8b;p=karo-tx-linux.git 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 --- diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index b33a75f1acef..21140fdccfd3 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -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); 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())