[src/trunk]: src/sys/arch if RB_HALT is setted, don't load kernel.

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

details:   https://anonhg.NetBSD.org/src/rev/9c324b72accc
branches:  trunk
changeset: 521484:9c324b72accc
user:      uch <uch%NetBSD.org@localhost>
date:      Thu Jan 31 16:25:54 2002 +0000

description:
if RB_HALT is setted, don't load kernel.

diffstat:

 sys/arch/hpcmips/hpcmips/machdep.c           |  9 +++++----
 sys/arch/hpcsh/hpcsh/machdep.c               |  7 ++++---
 sys/arch/playstation2/playstation2/machdep.c |  7 ++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (81 lines):

diff -r 41e6ce2ce01a -r 9c324b72accc sys/arch/hpcmips/hpcmips/machdep.c
--- a/sys/arch/hpcmips/hpcmips/machdep.c        Thu Jan 31 15:25:08 2002 +0000
+++ b/sys/arch/hpcmips/hpcmips/machdep.c        Thu Jan 31 16:25:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.67 2002/01/31 05:11:16 uch Exp $ */
+/*     $NetBSD: machdep.c,v 1.68 2002/01/31 16:25:54 uch Exp $ */
 
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.67 2002/01/31 05:11:16 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.68 2002/01/31 16:25:54 uch Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -658,11 +658,12 @@
        /* If "always halt" was specified as a boot flag, obey. */
        if ((boothowto & RB_HALT) != 0) {
                howto |= RB_HALT;
-       } else {
+       }
+
 #ifdef KLOADER_KERNEL_PATH
+       if ((howto & RB_HALT) == 0)
                kloader_reboot_setup(KLOADER_KERNEL_PATH);
 #endif
-       }
 
        boothowto = howto;
        if ((howto & RB_NOSYNC) == 0) {
diff -r 41e6ce2ce01a -r 9c324b72accc sys/arch/hpcsh/hpcsh/machdep.c
--- a/sys/arch/hpcsh/hpcsh/machdep.c    Thu Jan 31 15:25:08 2002 +0000
+++ b/sys/arch/hpcsh/hpcsh/machdep.c    Thu Jan 31 16:25:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.17 2002/01/29 18:53:02 uch Exp $ */
+/*     $NetBSD: machdep.c,v 1.18 2002/01/31 16:25:55 uch Exp $ */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -427,11 +427,12 @@
        /* If "always halt" was specified as a boot flag, obey. */
        if ((boothowto & RB_HALT) != 0) {
                howto |= RB_HALT;
-       } else {
+       }
+
 #ifdef KLOADER_KERNEL_PATH
+       if ((howto & RB_HALT) == 0)
                kloader_reboot_setup(KLOADER_KERNEL_PATH);
 #endif
-       }
 
        boothowto = howto;
        if ((howto & RB_NOSYNC) == 0) {
diff -r 41e6ce2ce01a -r 9c324b72accc sys/arch/playstation2/playstation2/machdep.c
--- a/sys/arch/playstation2/playstation2/machdep.c      Thu Jan 31 15:25:08 2002 +0000
+++ b/sys/arch/playstation2/playstation2/machdep.c      Thu Jan 31 16:25:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.2 2001/11/23 16:08:45 uch Exp $  */
+/*     $NetBSD: machdep.c,v 1.3 2002/01/31 16:25:56 uch Exp $  */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -309,11 +309,12 @@
        /* If "always halt" was specified as a boot flag, obey. */
        if (boothowto & RB_HALT) {
                howto |= RB_HALT;
-       } else {
+       }
+
 #ifdef KLOADER_KERNEL_PATH
+       if ((howto & RB_HALT) == 0)
                kloader_reboot_setup(KLOADER_KERNEL_PATH);
 #endif
-       }
 
        boothowto = howto;
        if ((howto & RB_NOSYNC) == 0 && (waittime < 0)) {