aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r--arch/x86/kernel/smpboot.c5
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)
1271 if (!num_processors) 1271 if (!num_processors)
1272 num_processors = 1; 1272 num_processors = 1;
1273 1273
1274#ifdef CONFIG_HOTPLUG_CPU
1275 if (additional_cpus == -1) { 1274 if (additional_cpus == -1) {
1276 if (disabled_cpus > 0) 1275 if (disabled_cpus > 0)
1277 additional_cpus = disabled_cpus; 1276 additional_cpus = disabled_cpus;
1278 else 1277 else
1279 additional_cpus = 0; 1278 additional_cpus = 0;
1280 } 1279 }
1281#else 1280
1282 additional_cpus = 0;
1283#endif
1284 possible = num_processors + additional_cpus; 1281 possible = num_processors + additional_cpus;
1285 if (possible > NR_CPUS) 1282 if (possible > NR_CPUS)
1286 possible = NR_CPUS; 1283 possible = NR_CPUS;