diff options
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 678d0b8c26f3..eff2fe175422 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -1213,11 +1213,12 @@ __init void prefill_possible_map(void) | |||
1213 | 1213 | ||
1214 | total_cpus = max_t(int, possible, num_processors + disabled_cpus); | 1214 | total_cpus = max_t(int, possible, num_processors + disabled_cpus); |
1215 | 1215 | ||
1216 | if (possible > CONFIG_NR_CPUS) { | 1216 | /* nr_cpu_ids could be reduced via nr_cpus= */ |
1217 | if (possible > nr_cpu_ids) { | ||
1217 | printk(KERN_WARNING | 1218 | printk(KERN_WARNING |
1218 | "%d Processors exceeds NR_CPUS limit of %d\n", | 1219 | "%d Processors exceeds NR_CPUS limit of %d\n", |
1219 | possible, CONFIG_NR_CPUS); | 1220 | possible, nr_cpu_ids); |
1220 | possible = CONFIG_NR_CPUS; | 1221 | possible = nr_cpu_ids; |
1221 | } | 1222 | } |
1222 | 1223 | ||
1223 | printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n", | 1224 | printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n", |