diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /arch/sparc64/kernel/devices.c | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
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 9327058a8..24ca3ff10 100644 --- a/arch/sparc64/kernel/devices.c +++ b/arch/sparc64/kernel/devices.c @@ -17,13 +17,14 @@ struct prom_cpuinfo linux_cpus[NR_CPUS]; int linux_num_cpus = 0; extern void cpu_probe(void); +extern unsigned long central_probe(unsigned long); __initfunc(unsigned long device_scan(unsigned long mem_start)) { char node_str[128]; int nd, prom_node_cpu, thismid; - int cpu_nds[NCPUS]; /* One node for each cpu */ + int cpu_nds[NR_CPUS]; /* One node for each cpu */ int cpu_ctr = 0; prom_getstring(prom_root_node, "device_type", node_str, sizeof(node_str)); @@ -43,11 +44,14 @@ device_scan(unsigned long mem_start)) if(strcmp(node_str, "cpu") == 0) { cpu_nds[cpu_ctr] = scan; linux_cpus[cpu_ctr].prom_node = scan; - prom_getproperty(scan, "mid", (char *) &thismid, sizeof(thismid)); + 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", cpu_ctr, (unsigned) scan, thismid); + printk("Found CPU %d <node=%08x,mid=%d>\n", + cpu_ctr, (unsigned) scan, thismid); cpu_ctr++; } }; @@ -62,5 +66,5 @@ device_scan(unsigned long mem_start)) linux_num_cpus = cpu_ctr; cpu_probe(); - return mem_start; + return central_probe(mem_start); } |