diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /arch/sparc64/kernel/devices.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'arch/sparc64/kernel/devices.c')
| -rw-r--r-- | arch/sparc64/kernel/devices.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c index 8d3aca325..93ea8ca4f 100644 --- a/arch/sparc64/kernel/devices.c +++ b/arch/sparc64/kernel/devices.c @@ -48,19 +48,23 @@ device_scan(unsigned long mem_start)) 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]; |