Skip to content

Commit

Permalink
x86: remove nesting CONFIG_HOTPLUG_CPU
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Li Zefan authored and Ingo Molnar committed Aug 15, 2008
1 parent 59f09ba commit 2bd455d
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/x86/kernel/smpboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2bd455d

Please sign in to comment.