diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-06-08 02:21:35 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-06-08 02:21:35 +0000 |
| commit | 451f1e3f291f7aa0a928696f18db95145845d998 (patch) | |
| tree | c5cf4e482357535cb290eb3ac0215d61bdd43046 /sys/arch | |
| parent | 6b01518778eea1182d4a6ae6dd9204501a6401ba (diff) | |
Make UltraSPARC-IV work.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc64/sparc64/cpu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/sparc64/sparc64/cpu.c b/sys/arch/sparc64/sparc64/cpu.c index 96dfceec919..ff5ef1241d7 100644 --- a/sys/arch/sparc64/sparc64/cpu.c +++ b/sys/arch/sparc64/sparc64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.39 2008/05/24 20:02:20 kettenis Exp $ */ +/* $OpenBSD: cpu.c,v 1.40 2008/06/08 02:21:34 kettenis Exp $ */ /* $NetBSD: cpu.c,v 1.13 2001/05/26 21:27:15 chs Exp $ */ /* @@ -109,9 +109,11 @@ alloc_cpuinfo(struct mainbus_attach_args *ma) struct cpu_info *cpi, *ci; extern paddr_t cpu0paddr; - portid = getpropint(ma->ma_node, "portid", -1); + portid = getpropint(ma->ma_node, "upa-portid", -1); + if (portid == -1) + portid = getpropint(ma->ma_node, "portid", -1); if (portid == -1) - portid = getpropint(ma->ma_node, "upa-portid", -1); + portid = getpropint(ma->ma_node, "cpuid", -1); if (portid == -1 && ma->ma_nreg > 0) portid = (ma->ma_reg[0].ur_paddr >> 32) & 0x0fffffff; if (portid == -1) |