Răsfoiți Sursa

[PATCH] i386: introduce the mechanism of disabling cpu hotplug control

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>
Siddha, Suresh B 18 ani în urmă
părinte
comite
fd6d7d2689
2 a modificat fișierele cu 8 adăugiri și 1 ștergeri
  1. 5 1
      arch/i386/kernel/topology.c
  2. 3 0
      include/asm-i386/cpu.h

+ 5 - 1
arch/i386/kernel/topology.c

@@ -40,14 +40,18 @@ int arch_register_cpu(int num)
 	 * restrictions and assumptions in kernel. This basically
 	 * restrictions and assumptions in kernel. This basically
 	 * doesnt add a control file, one cannot attempt to offline
 	 * doesnt add a control file, one cannot attempt to offline
 	 * BSP.
 	 * 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;
 		cpu_devices[num].cpu.no_control = 1;
 
 
 	return register_cpu(&cpu_devices[num].cpu, num);
 	return register_cpu(&cpu_devices[num].cpu, num);
 }
 }
 
 
 #ifdef CONFIG_HOTPLUG_CPU
 #ifdef CONFIG_HOTPLUG_CPU
+int enable_cpu_hotplug = 1;
 
 
 void arch_unregister_cpu(int num) {
 void arch_unregister_cpu(int num) {
 	return unregister_cpu(&cpu_devices[num].cpu);
 	return unregister_cpu(&cpu_devices[num].cpu);

+ 3 - 0
include/asm-i386/cpu.h

@@ -13,6 +13,9 @@ struct i386_cpu {
 extern int arch_register_cpu(int num);
 extern int arch_register_cpu(int num);
 #ifdef CONFIG_HOTPLUG_CPU
 #ifdef CONFIG_HOTPLUG_CPU
 extern void arch_unregister_cpu(int);
 extern void arch_unregister_cpu(int);
+extern int enable_cpu_hotplug;
+#else
+#define enable_cpu_hotplug	0
 #endif
 #endif
 
 
 DECLARE_PER_CPU(int, cpu_state);
 DECLARE_PER_CPU(int, cpu_state);