patch-2.3.18 linux/arch/ppc/kernel/setup.c

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

diff -u --recursive --new-file v2.3.17/linux/arch/ppc/kernel/setup.c linux/arch/ppc/kernel/setup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: setup.c,v 1.146 1999/08/31 06:54:08 davem Exp $
+ * $Id: setup.c,v 1.148 1999/09/05 11:56:34 paulus Exp $
  * Common prep/pmac/chrp boot and setup code.
  */
 
@@ -279,9 +279,11 @@
 				for ( s = 0; (s < i) && cpu_node->next ;
 				      s++, cpu_node = cpu_node->next )
 					/* nothing */ ;
+#if 0 /* SMP Pmacs don't have all cpu nodes -- Cort */
 				if ( s != i )
 					printk("get_cpuinfo(): ran out of "
 					       "cpu nodes.\n");
+#endif
 			}
 			fp = (int *) get_property(cpu_node, "clock-frequency", NULL);
 			if ( !fp ) break;
@@ -343,7 +345,6 @@
 identify_machine(unsigned long r3, unsigned long r4, unsigned long r5,
 		 unsigned long r6, unsigned long r7)
 {
-	
 #ifdef __SMP__
 	if ( first_cpu_booted ) return 0;
 #endif /* __SMP__ */

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