diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-01-01 19:44:25 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-01-01 19:44:25 +0000 |
commit | d8f32b2430b282f6c03e2947e7c35158f7b52448 (patch) | |
tree | 83c4c792cfd72cf45aec1be34961489ad55d25db | |
parent | e1e8689f411de3152b63d063bf69c959e1c68226 (diff) |
check db_panic in kdb_trap() as well; similar to i386 fix from assar
-rw-r--r-- | sys/arch/sparc/sparc/db_interface.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/sparc/sparc/db_interface.c b/sys/arch/sparc/sparc/db_interface.c index d17670d9ea1..85ee7ce58f4 100644 --- a/sys/arch/sparc/sparc/db_interface.c +++ b/sys/arch/sparc/sparc/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.7 1999/07/09 21:30:02 art Exp $ */ +/* $OpenBSD: db_interface.c,v 1.8 2000/01/01 19:44:24 deraadt Exp $ */ /* $NetBSD: db_interface.c,v 1.18 1997/09/01 00:16:31 pk Exp $ */ /* @@ -44,6 +44,7 @@ #include <machine/db_machdep.h> #include <ddb/db_access.h> +#include <ddb/db_var.h> #if defined(DDB) #include <ddb/db_command.h> @@ -190,6 +191,9 @@ kdb_trap(type, tf) case -1: /* keyboard interrupt */ break; default: + if (!db_panic) + return (0); + printf("kernel: %s trap", trap_type[type & 0xff]); if (db_recover != 0) { db_error("Faulted in DDB; continuing...\n"); |