Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd6d7d26 authored by Siddha, Suresh B's avatar Siddha, Suresh B Committed by Andi Kleen
Browse files

[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: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Li, Shaohua" <shaohua.li@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 274e1bbd

arch/i386/kernel/topology.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

include/asm-i386/cpu.h

+3 −0
Original line number Diff line number Diff line
@@ -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);