summaryrefslogtreecommitdiff
path: root/sys/arch/sgi
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-11-06 07:37:50 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-11-06 07:37:50 +0000
commit9af375f90b930933c8127c44738ff7cce8750bd9 (patch)
tree3f5d02e414a56cf2d529827569dc76539c49851b /sys/arch/sgi
parentbc1a437cc2bfd454a2a92a61e839d7ef366335b1 (diff)
When rebooting IP27 or IP35 systems, do not request the prom to skip diagnostics
anymore, as this causes the nsphy connected to the onboard iec to sometimes disappear after a warm boot. Unfortunately this brings back the long reboot times on Origin 200, despite still asking for no memory test.
Diffstat (limited to 'sys/arch/sgi')
-rw-r--r--sys/arch/sgi/sgi/ip27_machdep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/sgi/sgi/ip27_machdep.c b/sys/arch/sgi/sgi/ip27_machdep.c
index edbcda251fb..88defab4590 100644
--- a/sys/arch/sgi/sgi/ip27_machdep.c
+++ b/sys/arch/sgi/sgi/ip27_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip27_machdep.c,v 1.31 2009/10/26 20:14:42 miod Exp $ */
+/* $OpenBSD: ip27_machdep.c,v 1.32 2009/11/06 07:37:49 miod Exp $ */
/*
* Copyright (c) 2008, 2009 Miodrag Vallat.
@@ -539,7 +539,7 @@ ip27_halt(int howto)
} else
promop = GDA_PROMOP_REBOOT;
- promop |= GDA_PROMOP_MAGIC | GDA_PROMOP_NO_DIAGS |
+ promop |= GDA_PROMOP_MAGIC | /* GDA_PROMOP_NO_DIAGS | */
GDA_PROMOP_NO_MEMINIT;
#if 0