diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-05-20 23:24:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-20 23:24:17 -0700 |
| commit | 4a66417543805876c2bd8938657e74fc125af9f6 (patch) | |
| tree | 787eb7c743a51e875929de553692b5186e19811b /init | |
| parent | 245f2bf28387af25a9c27ebc9ea98ba013ae0656 (diff) | |
[PATCH] Neaten and fix init/main.c cpu bringup message
From: Andrew Theurer <habanero@us.ibm.com>
Use num_online_cpus in smp_init instead of counting cpus which may or may not
really be brought up.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/init/main.c b/init/main.c index ac28c99c157a..f19e679b03cd 100644 --- a/init/main.c +++ b/init/main.c @@ -350,20 +350,17 @@ static void __init setup_per_cpu_areas(void) static void __init smp_init(void) { unsigned int i; - unsigned j = 1; /* FIXME: This should be done in userspace --RR */ for_each_present_cpu(i) { if (num_online_cpus() >= max_cpus) break; - if (!cpu_online(i)) { + if (!cpu_online(i)) cpu_up(i); - j++; - } } /* Any cleanup work */ - printk("Brought up %u CPUs\n", j); + printk("Brought up %ld CPUs\n", (long)num_online_cpus()); smp_cpus_done(max_cpus); #if 0 /* Get other processors into their bootup holding patterns. */ |