patch-2.3.99-pre6 linux/arch/ppc/kernel/setup.c

Next file: linux/arch/ppc/kernel/time.c
Previous file: linux/arch/ppc/kernel/ptrace.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre5/linux/arch/ppc/kernel/setup.c linux/arch/ppc/kernel/setup.c
@@ -204,7 +204,7 @@
 	unsigned int pvr;
 	unsigned short maj, min;
 	
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 #define CPU_PRESENT(x) (cpu_callin_map[(x)])
 #define GET_PVR ((long int)(cpu_data[i].pvr))
 #define CD(x) (cpu_data[i].x)
@@ -355,13 +355,13 @@
 		bogosum += CD(loops_per_sec);
 	}
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	if ( i )
 		len += sprintf(buffer+len, "\n");
 	len += sprintf(buffer+len,"total bogomips\t: %lu.%02lu\n",
 		       (bogosum+2500)/500000,
 		       (bogosum+2500)/5000 % 100);
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 
 	/*
 	 * Ooh's and aah's info about zero'd pages in idle task

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)