diff options
| author |   mpi <mpi@openbsd.org> | 2019-07-20 23:03:55 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2019-07-20 23:03:55 +0000 |
| commit | ddb88ac25d4f894c9e5cf0750f4ddf70a69a0b9b (patch) | |
| tree | 2e6032d1d18b3043a39feedda8443dcc1d7b0f8e | |
| parent | When multiple ports share the same MAC, pick the physical one for delivery. (diff) | |
| download | wireguard-openbsd-ddb88ac25d4f894c9e5cf0750f4ddf70a69a0b9b.tar.xz wireguard-openbsd-ddb88ac25d4f894c9e5cf0750f4ddf70a69a0b9b.zip | |
Increment `db_active' before entering db_trap() like other archs do.
ok visa@
| -rw-r--r-- | sys/arch/m88k/m88k/db_interface.c | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/trap.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/m88k/m88k/db_interface.c b/sys/arch/m88k/m88k/db_interface.c index 72c512d2556..2931e23090b 100644 --- a/sys/arch/m88k/m88k/db_interface.c +++ b/sys/arch/m88k/m88k/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.22 2017/04/30 16:45:45 mpi Exp $ */ +/* $OpenBSD: db_interface.c,v 1.23 2019/07/20 23:03:55 mpi Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -405,9 +405,11 @@ m88k_db_trap(type, frame) ddb_regs = frame->tf_regs; + db_active++; cnpollc(TRUE); db_trap(type, 0); cnpollc(FALSE); + db_active--; frame->tf_regs = ddb_regs; diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index 6b308410f7a..e7b39f3191b 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.109 2019/07/09 23:48:08 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.110 2019/07/20 23:03:55 mpi Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -569,9 +569,11 @@ for (i = 0; i < errnum; i++) { /* should check for correct byte here or panic */ #ifdef DDB db_save_regs(frame); + db_active++; cnpollc(TRUE); db_trap(T_BREAKPOINT, 0); cnpollc(FALSE); + db_active--; #else panic("trap EXC_PGM"); #endif |