patch-2.1.115 linux/arch/sparc64/kernel/devices.c

Next file: linux/arch/sparc64/kernel/dtlb_backend.S
Previous file: linux/arch/sparc64/kernel/central.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.114/linux/arch/sparc64/kernel/devices.c linux/arch/sparc64/kernel/devices.c
@@ -48,19 +48,23 @@
 				prom_getproperty(scan, "upa-portid",
 						 (char *) &thismid, sizeof(thismid));
 				linux_cpus[cpu_ctr].mid = thismid;
-				prom_printf("Found CPU %d <node=%08x,mid=%d>\n",
+#ifdef __SMP__				
+				prom_printf("Found CPU %d (node=%08x,mid=%d)\n",
 					    cpu_ctr, (unsigned) scan,
 					    thismid);
-				printk("Found CPU %d <node=%08x,mid=%d>\n",
+				printk("Found CPU %d (node=%08x,mid=%d)\n",
 				       cpu_ctr, (unsigned) scan, thismid);
+#endif				       
 				cpu_ctr++;
 			}
 		};
 		if(cpu_ctr == 0) {
-			printk("No CPU nodes found, cannot continue.\n");
+			prom_printf("No CPU nodes found, cannot continue.\n");
 			prom_halt();
 		}
+#ifdef __SMP__		
 		printk("Found %d CPU prom device tree node(s).\n", cpu_ctr);
+#endif		
 	};
 	prom_node_cpu = cpu_nds[0];
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov