X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Fasm-x86%2Fcpu.h;h=73f2ea84fd74b024fa4ebc8e91cabcdab4340108;hb=7fda20f146d5d217684ffbc37c6b6c5f82c2dffd;hp=9d914e1e4aad446e649dd8678d856768e637a38d;hpb=6f35308c3ffa256bed183adf6f2c0c6c211ca487;p=~andy%2Flinux

diff --git a/include/asm-x86/cpu.h b/include/asm-x86/cpu.h
index 9d914e1e4aa..73f2ea84fd7 100644
--- a/include/asm-x86/cpu.h
+++ b/include/asm-x86/cpu.h
@@ -7,15 +7,13 @@
 #include <linux/nodemask.h>
 #include <linux/percpu.h>
 
-struct i386_cpu {
+struct x86_cpu {
 	struct cpu cpu;
 };
-extern int arch_register_cpu(int num);
+
 #ifdef CONFIG_HOTPLUG_CPU
+extern int arch_register_cpu(int num);
 extern void arch_unregister_cpu(int);
-extern int enable_cpu_hotplug;
-#else
-#define enable_cpu_hotplug	0
 #endif
 
 DECLARE_PER_CPU(int, cpu_state);