Name: CONFIG_SMP=n Hotplug CPU Build Fixes
Author: Rusty Russell
Status: Trivial
Depends: Hotcpu-mm/hotcpu-i386-mm.patch.gz
Version: -mm

D: Andrew noticed some, ahem, minor build problems with CONFIG_SMP=n.
D: That patch adds the neccessary macros for UP, and makes mach_apic.h
D: include inside #ifdef CONFIG_HOTPLUG_CPU.

diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .7554-2.6.2-rc2-mm2-uniprocessor-build.pre/arch/i386/kernel/irq.c .7554-2.6.2-rc2-mm2-uniprocessor-build/arch/i386/kernel/irq.c
--- .7554-2.6.2-rc2-mm2-uniprocessor-build.pre/arch/i386/kernel/irq.c	2004-02-01 23:36:22.000000000 +1100
+++ .7554-2.6.2-rc2-mm2-uniprocessor-build/arch/i386/kernel/irq.c	2004-02-01 23:36:24.000000000 +1100
@@ -47,7 +47,6 @@
 #include <asm/delay.h>
 #include <asm/desc.h>
 #include <asm/irq.h>
-#include <mach_apic.h>
 
 /*
  * 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 <mach_apic.h>
+
 static void migrate_irqs_from(int cpu)
 {
 	cpumask_t mask;
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .7554-2.6.2-rc2-mm2-uniprocessor-build.pre/include/linux/cpumask.h .7554-2.6.2-rc2-mm2-uniprocessor-build/include/linux/cpumask.h
--- .7554-2.6.2-rc2-mm2-uniprocessor-build.pre/include/linux/cpumask.h	2004-02-01 23:36:22.000000000 +1100
+++ .7554-2.6.2-rc2-mm2-uniprocessor-build/include/linux/cpumask.h	2004-02-01 23:36:24.000000000 +1100
@@ -31,6 +31,8 @@ extern cpumask_t cpu_active_map;
 #define for_each_online_cpu(cpu) for_each_cpu_mask(cpu, cpu_online_map)
 #else
 #define	cpu_online_map			cpumask_of_cpu(0)
+#define	cpu_possible_map		cpumask_of_cpu(0)
+#define	cpu_active_map			cpumask_of_cpu(0)
 #define num_online_cpus()		1
 #define cpu_online(cpu)			({ BUG_ON((cpu) != 0); 1; })
 #define cpu_possible(cpu)		({ BUG_ON((cpu) != 0); 1; })