summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2000-01-01 22:18:55 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2000-01-01 22:18:55 +0000
commita80a1a581aedff9b7f0929bc7036dbab1b80da3a (patch)
tree2db9286599c4adf1848d275006116e109473a0cf /sys
parent620693a0f31460b6bc1fd06436849e7753af9d91 (diff)
honour db_panic in kdb_trap()
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/m68k/m68k/db_interface.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/m68k/m68k/db_interface.c b/sys/arch/m68k/m68k/db_interface.c
index cb6cf6b5918..69600141770 100644
--- a/sys/arch/m68k/m68k/db_interface.c
+++ b/sys/arch/m68k/m68k/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.9 1997/03/21 00:36:39 niklas Exp $ */
+/* $OpenBSD: db_interface.c,v 1.10 2000/01/01 22:18:54 deraadt Exp $ */
/* $NetBSD: db_interface.c,v 1.24 1997/02/18 22:27:32 gwr Exp $ */
/*
@@ -43,6 +43,7 @@
#include <machine/db_machdep.h>
#include <ddb/db_command.h>
+#include <ddb/db_var.h>
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
@@ -85,6 +86,9 @@ kdb_trap(type, regs)
case -1:
break;
default:
+ if (!db_panic)
+ return (0);
+
kdbprinttrap(type, 0);
if (db_recover != 0) {
/* This will longjmp back to db_command_loop */