Commit 1ed0cdc2 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] Correct CPUs printout on boot.

This currently prints out the maximum number of CPUs the
kernel is configured to support, instead of the actual
number that the kernel brought up. Which results in odd
displays that look like you have more CPUs than you do.
parent 1a11fded
...@@ -339,7 +339,7 @@ static void __init setup_per_cpu_areas(void) ...@@ -339,7 +339,7 @@ static void __init setup_per_cpu_areas(void)
/* Called by boot processor to activate the rest. */ /* Called by boot processor to activate the rest. */
static void __init smp_init(void) static void __init smp_init(void)
{ {
unsigned int i; unsigned int i, j=0;
/* FIXME: This should be done in userspace --RR */ /* FIXME: This should be done in userspace --RR */
for (i = 0; i < NR_CPUS; i++) { for (i = 0; i < NR_CPUS; i++) {
...@@ -348,11 +348,12 @@ static void __init smp_init(void) ...@@ -348,11 +348,12 @@ static void __init smp_init(void)
if (cpu_possible(i) && !cpu_online(i)) { if (cpu_possible(i) && !cpu_online(i)) {
printk("Bringing up %i\n", i); printk("Bringing up %i\n", i);
cpu_up(i); cpu_up(i);
j++;
} }
} }
/* Any cleanup work */ /* Any cleanup work */
printk("CPUS done %u\n", max_cpus); printk("CPUS done %u\n", j);
smp_cpus_done(max_cpus); smp_cpus_done(max_cpus);
#if 0 #if 0
/* Get other processors into their bootup holding patterns. */ /* Get other processors into their bootup holding patterns. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment