Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6

[powerpc.git] / include / asm-i386 / cpu.h

diff --git a/include/asm-i386/cpu.h b/include/asm-i386/cpu.h
index 002740b..e7252c2 100644 (file)
--- a/include/asm-i386/cpu.h
+++ b/include/asm-i386/cpu.h
@@ -5,6 +5,7 @@
 #include <linux/cpu.h>
 #include <linux/topology.h>
 #include <linux/nodemask.h>
+#include <linux/percpu.h>
 
 #include <asm/node.h>
 
@@ -16,4 +17,5 @@ extern int arch_register_cpu(int num);
 extern void arch_unregister_cpu(int);
 #endif
 
+DECLARE_PER_CPU(int, cpu_state);
 #endif /* _ASM_I386_CPU_H_ */