From: Andrew Morton <akpm@osdl.org>

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/io_apic.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff -puN arch/i386/kernel/io_apic.c~genirq-convert-the-i386-architecture-to-irq-chips-fix-2 arch/i386/kernel/io_apic.c
--- devel/arch/i386/kernel/io_apic.c~genirq-convert-the-i386-architecture-to-irq-chips-fix-2	2006-05-29 16:21:38.000000000 -0700
+++ devel-akpm/arch/i386/kernel/io_apic.c	2006-05-29 16:21:38.000000000 -0700
@@ -2020,7 +2020,12 @@ static void unmask_IO_APIC_vector (unsig
 	unmask_IO_APIC_irq(irq);
 }
 
-#ifdef CONFIG_SMP
+/*
+ * Oh just glorious.  If CONFIG_PCI_MSI we've done
+ * #define set_ioapic_affinity set_ioapic_affinity_vector
+ */
+#if defined (CONFIG_SMP) && defined(CONFIG_X86_IO_APIC) && \
+		defined(CONFIG_PCI_MSI)
 static void set_ioapic_affinity_vector (unsigned int vector,
 					cpumask_t cpu_mask)
 {
_