diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2020-08-19 10:10:59 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2020-08-19 10:10:59 +0000 |
| commit | 8ba0cde5f5b1f4893fed53f798aea25db42477cc (patch) | |
| tree | d53f6fb5e1e82791c1277d4e1a98ccfaa8109a2f /sys/arch/mips64 | |
| parent | b1c76213ea9218d3823866f7dd850875db91b45d (diff) | |
Push KERNEL_LOCK/UNLOCK() dance inside trapsignal().
ok kettenis@, visa@
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/fp_emulate.c | 4 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/trap.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/arch/mips64/mips64/fp_emulate.c b/sys/arch/mips64/mips64/fp_emulate.c index ba6a7351fb4..379569b73a6 100644 --- a/sys/arch/mips64/mips64/fp_emulate.c +++ b/sys/arch/mips64/mips64/fp_emulate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fp_emulate.c,v 1.22 2019/01/14 15:02:57 visa Exp $ */ +/* $OpenBSD: fp_emulate.c,v 1.23 2020/08/19 10:10:58 mpi Exp $ */ /* * Copyright (c) 2010 Miodrag Vallat. @@ -431,9 +431,7 @@ deliver: if (sig != 0) { if (sig != SIGBUS && sig != SIGSEGV) sv.sival_ptr = (void *)pc; - KERNEL_LOCK(); trapsignal(p, sig, 0, fault_type, sv); - KERNEL_UNLOCK(); } } diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c index 87d390978cf..2a657cd6cb2 100644 --- a/sys/arch/mips64/mips64/trap.c +++ b/sys/arch/mips64/mips64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.145 2020/05/23 07:18:50 visa Exp $ */ +/* $OpenBSD: trap.c,v 1.146 2020/08/19 10:10:58 mpi Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -926,9 +926,7 @@ fault_common_no_miss: p->p_md.md_regs->cause = trapframe->cause; p->p_md.md_regs->badvaddr = trapframe->badvaddr; sv.sival_ptr = (void *)trapframe->badvaddr; - KERNEL_LOCK(); trapsignal(p, signal, ucode, sicode, sv); - KERNEL_UNLOCK(); } void |