summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/alpha/machdep.c5
-rw-r--r--sys/kern/subr_prf.c6
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 2e7de1c66f6..56ee777d1b2 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.177 2017/01/13 09:18:11 fcambus Exp $ */
+/* $OpenBSD: machdep.c,v 1.178 2017/04/27 11:48:08 mpi Exp $ */
/* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
/*-
@@ -684,9 +684,6 @@ nobootinfo:
* Look at arguments passed to us and compute boothowto.
*/
-#ifdef KADB
- boothowto |= RB_KDB;
-#endif
for (p = bootinfo.boot_flags; p && *p != '\0'; p++) {
/*
* Note that we'd really like to differentiate case here,
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 302989ca7e1..8f52a9169c9 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_prf.c,v 1.88 2017/04/20 14:13:00 visa Exp $ */
+/* $OpenBSD: subr_prf.c,v 1.89 2017/04/27 11:48:08 mpi Exp $ */
/* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */
/*-
@@ -205,10 +205,6 @@ panic(const char *fmt, ...)
#ifdef KGDB
kgdb_panic();
#endif
-#ifdef KADB
- if (boothowto & RB_KDB)
- kdbpanic();
-#endif
#ifdef DDB
if (db_panic)
Debugger();