X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=init%2Fmain.c;h=a92989e7836af6acb73bb6ce8b95ad76ee727f53;hb=aac012245a59d78372dc66d292ba567367d86b60;hp=1c5f6dce1bd2d062ab780a99b8417d9ceb7813b0;hpb=6168a702ab0be181e5e57a0b2d0e7376f7a47f0b;p=safe%2Fjmp%2Flinux-2.6

diff --git a/init/main.c b/init/main.c
index 1c5f6dc..a92989e 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 */