x86: fixup_irqs() doesn't need an argument.

The "map" arg is always cpu_online_mask.  Importantly, set_affinity
always ands the argument with cpu_online_mask anyway, so we don't need
to do it in fixup_irqs(), avoiding a temporary.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 arch/x86/include/asm/irq.h |    2 +-
 arch/x86/kernel/irq_32.c   |   14 +++++++-------
 arch/x86/kernel/irq_64.c   |   15 ++++++++-------
 arch/x86/kernel/smpboot.c  |    2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff -r 2693670c37b3 arch/x86/include/asm/irq.h
--- a/arch/x86/include/asm/irq.h	Tue Nov 18 20:53:45 2008 +1030
+++ b/arch/x86/include/asm/irq.h	Tue Nov 18 21:08:08 2008 +1030
@@ -37,7 +37,7 @@
 
 #ifdef CONFIG_HOTPLUG_CPU
 #include <linux/cpumask.h>
-extern void fixup_irqs(const cpumask_t *map);
+extern void fixup_irqs(void);
 #endif
 
 extern unsigned int do_IRQ(struct pt_regs *regs);
diff -r 2693670c37b3 arch/x86/kernel/irq_32.c
--- a/arch/x86/kernel/irq_32.c	Tue Nov 18 20:53:45 2008 +1030
+++ b/arch/x86/kernel/irq_32.c	Tue Nov 18 21:08:08 2008 +1030
@@ -233,25 +233,25 @@
 #ifdef CONFIG_HOTPLUG_CPU
 #include <mach_apic.h>
 
-void fixup_irqs(const struct cpumask *map)
+/* A cpu has been removed from cpu_online_mask.  Reset irq affinities. */
+void fixup_irqs(void)
 {
 	unsigned int irq;
 	static int warned;
 	struct irq_desc *desc;
 
 	for_each_irq_desc(irq, desc) {
-		cpumask_t mask;
-
+		const struct cpumask *affinity;
 		if (irq == 2)
 			continue;
 
-		cpumask_and(&mask, &desc->affinity, map);
-		if (any_online_cpu(mask) == NR_CPUS) {
+		affinity = &desc->affinity;
+		if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {
 			printk("Breaking affinity for irq %i\n", irq);
-			mask = *map;
+			affinity = cpu_all_mask;
 		}
 		if (desc->chip->set_affinity)
-			desc->chip->set_affinity(irq, &mask);
+			desc->chip->set_affinity(irq, affinity);
 		else if (desc->action && !(warned++))
 			printk("Cannot set affinity for irq %i\n", irq);
 	}
diff -r 2693670c37b3 arch/x86/kernel/irq_64.c
--- a/arch/x86/kernel/irq_64.c	Tue Nov 18 20:53:45 2008 +1030
+++ b/arch/x86/kernel/irq_64.c	Tue Nov 18 21:08:08 2008 +1030
@@ -83,16 +83,17 @@
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-void fixup_irqs(const cpumask_t *map)
+/* A cpu has been removed from cpu_online_mask.  Reset irq affinities. */
+void fixup_irqs(void)
 {
 	unsigned int irq;
 	static int warned;
 	struct irq_desc *desc;
 
 	for_each_irq_desc(irq, desc) {
-		cpumask_t mask;
 		int break_affinity = 0;
 		int set_affinity = 1;
+		const struct cpumask *affinity;
 
 		if (irq == 2)
 			continue;
@@ -100,23 +101,23 @@
 		/* interrupt's are disabled at this point */
 		spin_lock(&desc->lock);
 
+		affinity = &desc->affinity;
 		if (!irq_has_action(irq) ||
-		    cpumask_equal(&desc->affinity, map)) {
+		    cpumask_equal(affinity, cpu_online_mask)) {
 			spin_unlock(&desc->lock);
 			continue;
 		}
 
-		cpumask_and(&mask, &desc->affinity, map);
-		if (cpus_empty(mask)) {
+		if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {
 			break_affinity = 1;
-			mask = *map;
+			affinity = cpu_all_mask;
 		}
 
 		if (desc->chip->mask)
 			desc->chip->mask(irq);
 
 		if (desc->chip->set_affinity)
-			desc->chip->set_affinity(irq, &mask);
+			desc->chip->set_affinity(irq, affinity);
 		else if (!(warned++))
 			set_affinity = 0;
 
diff -r 2693670c37b3 arch/x86/kernel/smpboot.c
--- a/arch/x86/kernel/smpboot.c	Tue Nov 18 20:53:45 2008 +1030
+++ b/arch/x86/kernel/smpboot.c	Tue Nov 18 21:08:08 2008 +1030
@@ -1349,7 +1349,7 @@
 	lock_vector_lock();
 	remove_cpu_from_maps(cpu);
 	unlock_vector_lock();
-	fixup_irqs(cpu_online_mask);
+	fixup_irqs();
 }
 
 int native_cpu_disable(void)