summaryrefslogtreecommitdiff
path: root/sys/arch/arm64
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2018-03-20 15:45:33 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2018-03-20 15:45:33 +0000
commit0210029b617674d420e55dba5931baf0ea7b0e93 (patch)
treea0945557fe9a31e9c8178f7f1c31f76c06a75a1d /sys/arch/arm64
parent1d6b51f805863eb722e8d1174b8790d6f97e1c0a (diff)
Do not panic from ddb(4) when a lock requirement isn't fulfilled.
Extend the logic already present for panic() to any DDB-related operation such that if ddb(4) is entered because of a fault or other trap it is still possible to call 'boot reboot'. While here stop printing splassert() messages as well, to not fill the buffer. ok visa@, deraadt@
Diffstat (limited to 'sys/arch/arm64')
-rw-r--r--sys/arch/arm64/arm64/db_interface.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/arm64/arm64/db_interface.c b/sys/arch/arm64/arm64/db_interface.c
index 64675c08f8b..d615be12497 100644
--- a/sys/arch/arm64/arm64/db_interface.c
+++ b/sys/arch/arm64/arm64/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.4 2018/01/30 15:46:12 kettenis Exp $ */
+/* $OpenBSD: db_interface.c,v 1.5 2018/03/20 15:45:32 mpi Exp $ */
/* $NetBSD: db_interface.c,v 1.34 2003/10/26 23:11:15 chris Exp $ */
/*
@@ -122,8 +122,6 @@ extern label_t *db_recover;
struct db_variable * db_eregs = db_regs + nitems(db_regs);
-int db_active = 0;
-
#ifdef DDB
/*
* kdb_trap - field a TRACE or BPT trap