The patch titled
i386: introduce the mechanism of disabling cpu hotplug control
has been added to the -mm tree. Its filename is
i386-introduce-the-mechanism-of-disabling-cpu-hotplug-control.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: i386: introduce the mechanism of disabling cpu hotplug control
From: "Siddha, Suresh B" <suresh.b.siddha@xxxxxxxxx>
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@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: "Li, Shaohua" <shaohua.li@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/topology.c | 6 +++++-
include/asm-i386/cpu.h | 3 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff -puN arch/i386/kernel/topology.c~i386-introduce-the-mechanism-of-disabling-cpu-hotplug-control arch/i386/kernel/topology.c
--- a/arch/i386/kernel/topology.c~i386-introduce-the-mechanism-of-disabling-cpu-hotplug-control
+++ a/arch/i386/kernel/topology.c
@@ -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);
diff -puN include/asm-i386/cpu.h~i386-introduce-the-mechanism-of-disabling-cpu-hotplug-control include/asm-i386/cpu.h
--- a/include/asm-i386/cpu.h~i386-introduce-the-mechanism-of-disabling-cpu-hotplug-control
+++ a/include/asm-i386/cpu.h
@@ -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);
_
Patches currently in -mm which might be from suresh.b.siddha@xxxxxxxxx are
i386-add-write_pci_config_byte-to-direct-pci-access-routines.patch
i386-introduce-the-mechanism-of-disabling-cpu-hotplug-control.patch
x86_64-add-genapic_force.patch
fix-the-irqbalance-quirk-for-e7320-e7520-e7525.patch
suspend-dont-change-cpus_allowed-for-task-initiating-the-suspend.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
