[PATCH] i386: introduce the mechanism of disabling cpu hotplug control
authorSiddha, Suresh B <suresh.b.siddha@intel.com>
Thu, 7 Dec 2006 01:14:10 +0000 (02:14 +0100)
committerAndi Kleen <andi@basil.nowhere.org>
Thu, 7 Dec 2006 01:14:10 +0000 (02:14 +0100)
Add 'enable_cpu_hotplug' flag and when cleared, the hotplug control file
("online") will not be added under /sys/devices/system/cpu/cpuX/

Next patch doing PCI quirks will use this.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Li, Shaohua" <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
arch/i386/kernel/topology.c
include/asm-i386/cpu.h

index 07d6da36a8253f39bbce04e90ab4edc0ece8aed4..844c08fdb225e2692fdd4a41fa940eece9104e77 100644 (file)
@@ -40,14 +40,18 @@ int arch_register_cpu(int num)
         * restrictions and assumptions in kernel. This basically
         * doesnt add a control file, one cannot attempt to offline
         * BSP.
+        *
+        * Also certain PCI quirks require not to enable hotplug control
+        * for all CPU's.
         */
-       if (!num)
+       if (!num || !enable_cpu_hotplug)
                cpu_devices[num].cpu.no_control = 1;
 
        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);
index b1bc7b1b64b0e304d13f907e4d5cd607417bdfee..9d914e1e4aad446e649dd8678d856768e637a38d 100644 (file)
@@ -13,6 +13,9 @@ 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);