diff options
| author | Li Zefan | 2008-08-04 05:26:38 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-08-15 16:33:28 +0200 |
| commit | 2bd455dbfebfd632a8dcf1d3d1612737986fde0a (patch) | |
| tree | 864dd9d6c07617b67f8c4496c4f4472e2d97132d /arch/x86/kernel/smpboot.c | |
| parent | x86: fix comment in protected mode header (diff) | |
| download | kernel-qcow2-linux-2bd455dbfebfd632a8dcf1d3d1612737986fde0a.tar.gz kernel-qcow2-linux-2bd455dbfebfd632a8dcf1d3d1612737986fde0a.tar.xz kernel-qcow2-linux-2bd455dbfebfd632a8dcf1d3d1612737986fde0a.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 332512767f4f..d5e19c362046 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -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; |