summaryrefslogtreecommitdiffstats
path: root/sys/boot/sparc64
diff options
context:
space:
mode:
authorjake <jake@FreeBSD.org>2002-05-11 22:05:22 +0000
committerjake <jake@FreeBSD.org>2002-05-11 22:05:22 +0000
commit2923a1a3ac1fa915334314b867115f6a3a77649a (patch)
treee8b1e7704e98fec8b081c524ebd84065b4835d8f /sys/boot/sparc64
parent475814a8e21d201663c75979c687c04eb795070b (diff)
downloadFreeBSD-src-2923a1a3ac1fa915334314b867115f6a3a77649a.zip
FreeBSD-src-2923a1a3ac1fa915334314b867115f6a3a77649a.tar.gz
Attempt to not crash and burn on UltraSPARC III machines; the cpuid property
is named differently.
Diffstat (limited to 'sys/boot/sparc64')
-rw-r--r--sys/boot/sparc64/loader/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c
index a73b6c0..054563d 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/sys/boot/sparc64/loader/main.c
@@ -323,7 +323,8 @@ tlb_init(void)
if (OF_getprop(child, "device_type", buf, sizeof(buf)) > 0 &&
strcmp(buf, "cpu") == 0) {
if (OF_getprop(child, "upa-portid", &cpu,
- sizeof(cpu)) == -1)
+ sizeof(cpu)) == -1 && OF_getprop(child, "portid",
+ &cpu, sizeof(cpu)) == -1)
panic("main: OF_getprop");
if (cpu == bootcpu)
break;
OpenPOWER on IntegriCloud