diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-10-17 18:04:38 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:16:16 +0200 |
| commit | a850cef77f148c2e305022a1ed86ca6cff5ee300 (patch) | |
| tree | 4bae5d03aabdfa5f3a96a38c885cc943df8bb1b4 | |
| parent | fb7ae26df0b1218b39049b659064d57b58616c94 (diff) | |
| download | op-kernel-dev-a850cef77f148c2e305022a1ed86ca6cff5ee300.zip op-kernel-dev-a850cef77f148c2e305022a1ed86ca6cff5ee300.tar.gz | |
i386: no need to make enable_cpu_hotplug a variable
As long as there's no write access to this variable there's no reason to
let gcc check it at runtime.
[ tglx: arch/x86 adaptation ]
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/kernel/topology.c | 6 | ||||
| -rw-r--r-- | include/asm-x86/cpu.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/kernel/topology.c b/arch/x86/kernel/topology.c index c25f23e..8caa0b7 100644 --- a/arch/x86/kernel/topology.c +++ b/arch/x86/kernel/topology.c @@ -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); } diff --git a/include/asm-x86/cpu.h b/include/asm-x86/cpu.h index 9d914e1e..b1bc7b1 100644 --- a/include/asm-x86/cpu.h +++ b/include/asm-x86/cpu.h @@ -13,9 +13,6 @@ 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); |
