---

yaml --- r: 70987 b: refs/heads/master c: a850cef h: refs/heads/master i: 70985: ca8b042 70983: 981d4cc v: v3
git-mirror · Oct 17, 2007 · 9562b88 · 9562b88
1 parent 55696b7
commit 9562b88
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb7ae26df0b1218b39049b659064d57b58616c94
+refs/heads/master: a850cef77f148c2e305022a1ed86ca6cff5ee300
diff --git a/trunk/arch/x86/kernel/topology.c b/trunk/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/trunk/include/asm-x86/cpu.h b/trunk/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);