summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2000-01-03 19:19:41 +0000
committerderaadt <deraadt@openbsd.org>2000-01-03 19:19:41 +0000
commitb28ce4658e141edf2d2d813fa879949cf8391a0c (patch)
tree437e964b3eb662556fff88313e3d7ce16bdac5b5
parentcannot really adjust MCLSHIFT (diff)
downloadwireguard-openbsd-b28ce4658e141edf2d2d813fa879949cf8391a0c.tar.xz
wireguard-openbsd-b28ce4658e141edf2d2d813fa879949cf8391a0c.zip
check db_panic in kdb_trap() as well; similar to i386 fix from assar
-rw-r--r--sys/arch/alpha/alpha/db_interface.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/alpha/alpha/db_interface.c b/sys/arch/alpha/alpha/db_interface.c
index d180b68207e..b1d95f08cd2 100644
--- a/sys/arch/alpha/alpha/db_interface.c
+++ b/sys/arch/alpha/alpha/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.8 1997/07/23 23:31:11 niklas Exp $ */
+/* $OpenBSD: db_interface.c,v 1.9 2000/01/03 19:19:41 deraadt Exp $ */
/*
* Copyright (c) 1997 Niklas Hallqvist. All rights reserverd.
@@ -43,6 +43,7 @@
#include <ddb/db_output.h>
#include <ddb/db_run.h>
#include <ddb/db_sym.h>
+#include <ddb/db_var.h>
#include <ddb/db_variables.h>
#include <ddb/db_extern.h>
@@ -170,6 +171,9 @@ kdb_trap(type, code, regs)
if (code == ALPHA_IF_CODE_BPT)
break;
default:
+ if (!db_panic)
+ return (0);
+
kdbprinttrap(type, code);
if (db_recover != 0) {
db_error("Faulted in DDB; continuing...\n");