summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2007-11-28 19:07:48 +0000
committerkettenis <kettenis@openbsd.org>2007-11-28 19:07:48 +0000
commite4dcb4c6cb505c25ea6fe3ee1d0d773d22bd5d08 (patch)
tree7563b04753f97c52edb9ac85dad116c3edc07f4c
parent%hhd was being printed as if %hd was specified (diff)
downloadwireguard-openbsd-e4dcb4c6cb505c25ea6fe3ee1d0d773d22bd5d08.tar.xz
wireguard-openbsd-e4dcb4c6cb505c25ea6fe3ee1d0d773d22bd5d08.zip
Give UltraSPARC-IV CPUs a chance again to attach on GENERIC.
-rw-r--r--sys/arch/sparc64/sparc64/cpu.c8
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);