ARM: CPU hotplug: pass in proper affinity mask on IRQ migration

[mv-sheeva.git] / arch / arm / kernel / irq.c

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index d7aa5c97877cc34797069c670cf380ba29b703d7..ab63c05290e5e5801525a12e2ec193e3a14b0be3 100644 (file)
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -133,17 +133,15 @@ int __init arch_probe_nr_irqs(void)
 
 static bool migrate_one_irq(struct irq_data *d)
 {
-       unsigned int cpu = cpumask_any_and(d->affinity, cpu_online_mask);
+       const struct cpumask *affinity = d->affinity;
        bool ret = false;
 
-       if (cpu >= nr_cpu_ids) {
-               cpu = cpumask_any(cpu_online_mask);
+       if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {
+               affinity cpu_online_mask;
                ret = true;
        }
 
-       pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", d->irq, d->node, cpu);
-
-       d->chip->irq_set_affinity(d, cpumask_of(cpu), true);
+       d->chip->irq_set_affinity(d, affinity, true);
 
        return ret;
 }