diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-11-28 19:07:49 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-11-28 19:07:49 +0000 |
| commit | f33be9bffe76da6db0b21b0444e79a0ac3ff706e (patch) | |
| tree | cea109678dd87013281996bf995de5cc671b09f9 /sys | |
| parent | 1270672ddc009b8a0c3270ad4c53077bf24ae4f3 (diff) | |
Give UltraSPARC-IV CPUs a chance again to attach on GENERIC.
Diffstat (limited to 'sys')
| -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 262c61b1513..09bbafeedbd 100644 --- a/sys/arch/sparc64/sparc64/cpu.c +++ b/sys/arch/sparc64/sparc64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.31 2007/11/16 23:27:28 kettenis Exp $ */ +/* $OpenBSD: cpu.c,v 1.32 2007/11/28 19:07:48 kettenis Exp $ */ /* $NetBSD: cpu.c,v 1.13 2001/05/26 21:27:15 chs Exp $ */ /* @@ -188,9 +188,11 @@ cpu_match(parent, vcf, aux) * On singleprocessor kernels, only match the CPU we're * running on. */ - portid = getpropint(ma->ma_node, "portid", -1); + portid = getpropint(ma->ma_node, "upa-portid", -1); if (portid == -1) - portid = getpropint(ma->ma_node, "upa-portid", -1); + portid = getpropint(ma->ma_node, "portid", -1); + if (portid == -1) + portid = getpropint(ma->ma_node, "cpuid", -1); if (portid == -1) return (0); |