[src/netbsd-3]: src/sys/arch Pull up following revision(s) (requested by jdc ...

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

details:   https://anonhg.NetBSD.org/src/rev/d2d262564ca5
branches:  netbsd-3
changeset: 577420:d2d262564ca5
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Oct 30 18:18:13 2005 +0000

description:
Pull up following revision(s) (requested by jdc in ticket #921):
        sys/arch/sparc/sparc/db_interface.c: revision 1.65
        sys/arch/sparc64/sparc64/db_interface.c: revision 1.81
Don't drop to ddb in the default case if ddb.onpanic is 0.
OK'd by martin@.

diffstat:

 sys/arch/sparc/sparc/db_interface.c     |  8 ++++++--
 sys/arch/sparc64/sparc64/db_interface.c |  8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (72 lines):

diff -r d71e009ddaa9 -r d2d262564ca5 sys/arch/sparc/sparc/db_interface.c
--- a/sys/arch/sparc/sparc/db_interface.c       Sun Oct 30 02:35:37 2005 +0000
+++ b/sys/arch/sparc/sparc/db_interface.c       Sun Oct 30 18:18:13 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.61 2004/05/13 09:36:44 pk Exp $ */
+/*     $NetBSD: db_interface.c,v 1.61.10.1 2005/10/30 18:18:13 tron Exp $ */
 
 /*
  * Mach Operating System
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.61 2004/05/13 09:36:44 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.61.10.1 2005/10/30 18:18:13 tron Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -53,6 +53,7 @@
 #include <machine/db_machdep.h>
 
 #include <ddb/db_access.h>
+#include <ddb/ddbvar.h>
 
 #if defined(DDB)
 #include <ddb/db_command.h>
@@ -310,6 +311,9 @@
        case -1:                /* keyboard interrupt */
                break;
        default:
+               if (!db_onpanic && db_recover==0)
+                       return (0);
+
                printf("kernel: %s trap\n", trap_type[type & 0xff]);
                if (db_recover != 0) {
                        db_error("Faulted in DDB; continuing...\n");
diff -r d71e009ddaa9 -r d2d262564ca5 sys/arch/sparc64/sparc64/db_interface.c
--- a/sys/arch/sparc64/sparc64/db_interface.c   Sun Oct 30 02:35:37 2005 +0000
+++ b/sys/arch/sparc64/sparc64/db_interface.c   Sun Oct 30 18:18:13 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.77 2004/05/20 00:52:58 petrov Exp $ */
+/*     $NetBSD: db_interface.c,v 1.77.10.1 2005/10/30 18:18:13 tron Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.77 2004/05/20 00:52:58 petrov Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.77.10.1 2005/10/30 18:18:13 tron Exp $");
 
 #include "opt_ddb.h"
 
@@ -56,6 +56,7 @@
 #include <ddb/db_access.h>
 #include <ddb/db_output.h>
 #include <ddb/db_interface.h>
+#include <ddb/ddbvar.h>
 
 #include <machine/instr.h>
 #include <machine/cpu.h>
@@ -300,6 +301,9 @@
                printf("kdb tf=%p\n", tf);
                break;
        default:
+               if (!db_onpanic && db_recover==0)
+                       return (0);
+
                printf("kernel trap %x: %s\n", type, trap_type[type & 0x1ff]);
                if (db_recover != 0) {
                        prom_abort();