Bladeren bron

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 <lizf@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Li Zefan 17 jaren geleden
bovenliggende
commit
2bd455dbfe
1 gewijzigde bestanden met toevoegingen van 1 en 4 verwijderingen
  1. 1 4
      arch/x86/kernel/smpboot.c

+ 1 - 4
arch/x86/kernel/smpboot.c

@@ -1271,16 +1271,13 @@ __init void prefill_possible_map(void)
 	if (!num_processors)
 	if (!num_processors)
 		num_processors = 1;
 		num_processors = 1;
 
 
-#ifdef CONFIG_HOTPLUG_CPU
 	if (additional_cpus == -1) {
 	if (additional_cpus == -1) {
 		if (disabled_cpus > 0)
 		if (disabled_cpus > 0)
 			additional_cpus = disabled_cpus;
 			additional_cpus = disabled_cpus;
 		else
 		else
 			additional_cpus = 0;
 			additional_cpus = 0;
 	}
 	}
-#else
-	additional_cpus = 0;
-#endif
+
 	possible = num_processors + additional_cpus;
 	possible = num_processors + additional_cpus;
 	if (possible > NR_CPUS)
 	if (possible > NR_CPUS)
 		possible = NR_CPUS;
 		possible = NR_CPUS;