aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-02-20 13:57:51 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-20 17:10:13 -0800
commit53b8a315b76a3f3c70a5644976c0095460eb13d8 (patch)
treef407a607adb1f552942aef9150ec709ed3f01798 /init
parent[PATCH] Replace highest_possible_node_id() with nr_node_ids (diff)
downloadlinux-dev-53b8a315b76a3f3c70a5644976c0095460eb13d8.tar.xz
linux-dev-53b8a315b76a3f3c70a5644976c0095460eb13d8.zip
[PATCH] Convert highest_possible_processor_id to nr_cpu_ids
We frequently need the maximum number of possible processors in order to allocate arrays for all processors. So far this was done using highest_possible_processor_id(). However, we do need the number of processors not the highest id. Moreover the number was so far dynamically calculated on each invokation. The number of possible processors does not change when the system is running. We can therefore calculate that number once. Signed-off-by: Christoph Lameter <clameter@sgi.com> Cc: Frederik Deweerdt <frederik.deweerdt@gmail.com> Cc: Neil Brown <neilb@suse.de> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/main.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c
index 1c5f6dce1bd2..a92989e7836a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -387,14 +387,19 @@ static void __init setup_per_cpu_areas(void)
/* Called by boot processor to activate the rest. */
static void __init smp_init(void)
{
- unsigned int i;
+ unsigned int cpu;
+ unsigned highest = 0;
+
+ for_each_cpu_mask(cpu, cpu_possible_map)
+ highest = cpu;
+ nr_cpu_ids = highest + 1;
/* FIXME: This should be done in userspace --RR */
- for_each_present_cpu(i) {
+ for_each_present_cpu(cpu) {
if (num_online_cpus() >= max_cpus)
break;
- if (!cpu_online(i))
- cpu_up(i);
+ if (!cpu_online(cpu))
+ cpu_up(cpu);
}
/* Any cleanup work */