Merge git://git.infradead.org/battery-2.6

[powerpc.git] / arch / x86 / kernel / topology.c

diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c
index 4578235..8caa0b7 100644 (file)
--- a/arch/x86/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
@@ -1,5 +1,5 @@
 /*
- * arch/i386/kernel/topology.c - Populate sysfs with topology information
+ * Populate sysfs with topology information
  *
  * Written by: Matthew Dobson, IBM Corporation
  * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL
@@ -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);
 }