Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / asm-i386 / cpu.h

diff --git a/include/asm-i386/cpu.h b/include/asm-i386/cpu.h
index 002740b..9d914e1 100644 (file)
--- a/include/asm-i386/cpu.h
+++ b/include/asm-i386/cpu.h
@@ -5,8 +5,7 @@
 #include <linux/cpu.h>
 #include <linux/topology.h>
 #include <linux/nodemask.h>
-
-#include <asm/node.h>
+#include <linux/percpu.h>
 
 struct i386_cpu {
        struct cpu cpu;
@@ -14,6 +13,10 @@ struct i386_cpu {
 extern int arch_register_cpu(int num);
 #ifdef CONFIG_HOTPLUG_CPU
 extern void arch_unregister_cpu(int);
+extern int enable_cpu_hotplug;
+#else
+#define enable_cpu_hotplug     0
 #endif
 
+DECLARE_PER_CPU(int, cpu_state);
 #endif /* _ASM_I386_CPU_H_ */