2 files changed, 3 insertions, 6 deletions

diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index c25f23eb397c..8caa0b777466 100644
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -44,15 +44,15 @@ int arch_register_cpu(int num)
          * Also certain PCI quirks require not to enable hotplug control
          * for all CPU's.
          */
-        if (num && enable_cpu_hotplug)
+#ifdef CONFIG_HOTPLUG_CPU
+        if (num)
                 cpu_devices[num].cpu.hotpluggable = 1;
+#endif
 
         return register_cpu(&cpu_devices[num].cpu, num);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-int enable_cpu_hotplug = 1;
-
 void arch_unregister_cpu(int num) {
         return unregister_cpu(&cpu_devices[num].cpu);
 }
diff --git a/include/asm-x86/cpu.h b/include/asm-x86/cpu.h
index 9d914e1e4aad..b1bc7b1b64b0 100644
--- a/include/asm-x86/cpu.h
+++ b/include/asm-x86/cpu.h
@@ -13,9 +13,6 @@ 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);