From: <aot...@us...> - 2004-02-18 20:11:49
|
Update of /cvsroot/gc-linux/linux/init In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/init Modified Files: main.c Log Message: Merged 2.6.3 Index: main.c =================================================================== RCS file: /cvsroot/gc-linux/linux/init/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- main.c 14 Feb 2004 17:50:21 -0000 1.3 +++ main.c 18 Feb 2004 20:01:59 -0000 1.4 @@ -339,21 +339,21 @@ /* Called by boot processor to activate the rest. */ static void __init smp_init(void) { - unsigned int i, j=0; + unsigned int i; + unsigned j = 0; /* FIXME: This should be done in userspace --RR */ for (i = 0; i < NR_CPUS; i++) { if (num_online_cpus() >= max_cpus) break; if (cpu_possible(i) && !cpu_online(i)) { - printk("Bringing up %i\n", i); cpu_up(i); j++; } } /* Any cleanup work */ - printk("CPUS done %u\n", j); + printk("Brought up %u CPUs\n", j); smp_cpus_done(max_cpus); #if 0 /* Get other processors into their bootup holding patterns. */ |