aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/smpboot.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 8dd201c31329..8c3aca7cb343 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1261,8 +1261,6 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
1261 check_nmi_watchdog(); 1261 check_nmi_watchdog();
1262} 1262}
1263 1263
1264static int additional_cpus = -1;
1265
1266/* 1264/*
1267 * cpu_possible_map should be static, it cannot change as cpu's 1265 * cpu_possible_map should be static, it cannot change as cpu's
1268 * are onlined, or offlined. The reason is per-cpu data-structures 1266 * are onlined, or offlined. The reason is per-cpu data-structures
@@ -1282,21 +1280,13 @@ static int additional_cpus = -1;
1282 */ 1280 */
1283__init void prefill_possible_map(void) 1281__init void prefill_possible_map(void)
1284{ 1282{
1285 int i; 1283 int i, possible;
1286 int possible;
1287 1284
1288 /* no processor from mptable or madt */ 1285 /* no processor from mptable or madt */
1289 if (!num_processors) 1286 if (!num_processors)
1290 num_processors = 1; 1287 num_processors = 1;
1291 1288
1292 if (additional_cpus == -1) { 1289 possible = num_processors + disabled_cpus;
1293 if (disabled_cpus > 0)
1294 additional_cpus = disabled_cpus;
1295 else
1296 additional_cpus = 0;
1297 }
1298
1299 possible = num_processors + additional_cpus;
1300 if (possible > NR_CPUS) 1290 if (possible > NR_CPUS)
1301 possible = NR_CPUS; 1291 possible = NR_CPUS;
1302 1292