[src/netbsd-3-0]: src/sys/arch/amd64/amd64 Pull up following revision(s) (req...

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

details:   https://anonhg.NetBSD.org/src/rev/936c72a55b47
branches:  netbsd-3-0
changeset: 579307:936c72a55b47
user:      ghen <ghen%NetBSD.org@localhost>
date:      Mon Oct 16 21:28:25 2006 +0000

description:
Pull up following revision(s) (requested by tron in ticket #1550):
        sys/arch/amd64/amd64/trap.c: revision 1.22
use panic() instead of cpu_reboot() for unhandled kernel traps.

diffstat:

 sys/arch/amd64/amd64/trap.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r ba817b925251 -r 936c72a55b47 sys/arch/amd64/amd64/trap.c
--- a/sys/arch/amd64/amd64/trap.c       Mon Oct 16 20:46:55 2006 +0000
+++ b/sys/arch/amd64/amd64/trap.c       Mon Oct 16 21:28:25 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.19 2004/08/28 17:53:00 jdolecek Exp $       */
+/*     $NetBSD: trap.c,v 1.19.12.1 2006/10/16 21:28:25 ghen Exp $      */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.19 2004/08/28 17:53:00 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.19.12.1 2006/10/16 21:28:25 ghen Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -243,8 +243,7 @@
                    type, frame->tf_err, (u_long)frame->tf_rip, frame->tf_cs,
                    frame->tf_rflags, rcr2(), curcpu()->ci_ilevel, frame->tf_rsp);
 
-               /* panic("trap"); */
-               cpu_reboot(RB_HALT, NULL);
+               panic("trap");
                /*NOTREACHED*/
 
        case T_PROTFLT: