Skip to contentSkip to conversation

x86: remove nesting CONFIG_HOTPLUG_CPU

PATCH Applied Li Zefan 2 participants 2 messages Aug 4, 2008 – Aug 15, 2008 x86

lore
Share & tools
lore

Li Zefan

author
#0 lore raw

PATCH 1/1 x86: remove nesting CONFIG_HOTPLUG_CPU

prefill_possible_map() is defined inside CONFIG_HOTPLUG_CPU, so the nesting CONFIG_HOTPLUG_CPU is just redundant.

Signed-off-by Li Zefan <[email protected]>
---
 arch/x86/kernel/smpboot.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
arch/x86/kernel/smpboot.c +1 -4
index 3325127..d5e19c3 100644
@@ -1271,16 +1271,13 @@ __init void prefill_possible_map(void)
 	if (!num_processors)
 		num_processors = 1;
 
-#ifdef CONFIG_HOTPLUG_CPU
 	if (additional_cpus == -1) {
 		if (disabled_cpus > 0)
 			additional_cpus = disabled_cpus;
 		else
 			additional_cpus = 0;
 	}
-#else
-	additional_cpus = 0;
-#endif
+
 	possible = num_processors + additional_cpus;
 	if (possible > NR_CPUS)
 		possible = NR_CPUS;
Signature · 1 line
1.5.4.rc3
Applied
#1 lore raw
Quoted 2 lines · Li Zefan

prefill_possible_map() is defined inside CONFIG_HOTPLUG_CPU, so the nesting CONFIG_HOTPLUG_CPU is just redundant.

applied to tip/x86/cleanups - thanks.

Ingo