[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/kernel ppc_ksyms.c,1.9,1.10 setup.c,1.3,1.4

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/ppc/kernel

Modified Files:
	ppc_ksyms.c setup.c 
Log Message:
Synced to 2.5.24

Index: ppc_ksyms.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/ppc_ksyms.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ppc_ksyms.c	18 Jun 2002 18:51:54 -0000	1.9
+++ ppc_ksyms.c	22 Jun 2002 17:50:58 -0000	1.10
@@ -227,7 +227,6 @@
 #endif
 EXPORT_SYMBOL(smp_call_function);
 EXPORT_SYMBOL(smp_hw_index);
-EXPORT_SYMBOL(smp_num_cpus);
 EXPORT_SYMBOL(synchronize_irq);
 #endif
 

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- setup.c	18 Jun 2002 18:51:54 -0000	1.3
+++ setup.c	22 Jun 2002 17:50:58 -0000	1.4
@@ -146,8 +146,8 @@
 		/* Show summary information */
 #ifdef CONFIG_SMP
 		unsigned long bogosum = 0;
-		for (i = 0; i < smp_num_cpus; ++i)
-			if (cpu_online_map & (1 << i))
+		for (i = 0; i < NR_CPUS; ++i)
+			if (cpu_online(i))
 				bogosum += cpu_data[i].loops_per_jiffy;
 		seq_printf(m, "total bogomips\t: %lu.%02lu\n",
 			   bogosum/(500000/HZ), bogosum/(5000/HZ) % 100);