From: Rusty Russell Makes mach_apic.h include inside #ifdef CONFIG_HOTPLUG_CPU. --- arch/i386/kernel/irq.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN arch/i386/kernel/irq.c~cpuhotplug-x86-up-fixes arch/i386/kernel/irq.c --- 25/arch/i386/kernel/irq.c~cpuhotplug-x86-up-fixes 2004-02-01 11:29:47.000000000 -0800 +++ 25-akpm/arch/i386/kernel/irq.c 2004-02-01 11:29:47.000000000 -0800 @@ -47,7 +47,6 @@ #include #include #include -#include /* * Linux has a controller-independent x86 interrupt architecture. @@ -970,6 +969,8 @@ static int irq_affinity_write_proc(struc #endif #ifdef CONFIG_HOTPLUG_CPU +#include + static void migrate_irqs_from(int cpu) { cpumask_t mask; _