[src/netbsd-1-5]: src/sys/arch/sun3/sun3x Pull up revision 1.61 (requested by...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f71ea93eefef
branches:  netbsd-1-5
changeset: 490376:f71ea93eefef
user:      he <he%NetBSD.org@localhost>
date:      Fri Dec 15 04:26:18 2000 +0000

description:
Pull up revision 1.61 (requested by tsutsui):
  Make PROM boot command work properly even after halt on 3/80.

diffstat:

 sys/arch/sun3/sun3x/machdep.c |  14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diffs (28 lines):

diff -r 015803d81e7f -r f71ea93eefef sys/arch/sun3/sun3x/machdep.c
--- a/sys/arch/sun3/sun3x/machdep.c     Fri Dec 15 04:25:55 2000 +0000
+++ b/sys/arch/sun3/sun3x/machdep.c     Fri Dec 15 04:26:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.57 2000/06/05 23:45:02 jhawk Exp $       */
+/*     $NetBSD: machdep.c,v 1.57.2.1 2000/12/15 04:26:18 he Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -524,17 +524,7 @@
        if (howto & RB_HALT) {
        haltsys:
                printf("Kernel halted.\n");
-#if 0
-               /*
-                * This calls the PROM monitor "exit_to_mon" function
-                * which appears to have problems...  SunOS uses the
-                * "abort" function when you halt (bug work-around?)
-                * so we might as well do the same.
-                */
-               sunmon_halt(); /* provokes PROM monitor bug */
-#else
-               sunmon_abort();
-#endif
+               sunmon_halt();
        }
 
        /*