summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2018-05-31 11:38:15 +0000
committermpi <mpi@openbsd.org>2018-05-31 11:38:15 +0000
commitecb91bb14f9afd9265d562bfc010da73c32734d6 (patch)
treef0b127b0680dd7c2a94d206daf0086c7ffcdc3d8
parentRemove comcnspeed and comcnmode. They serve no purpose anymore. Configuring (diff)
downloadwireguard-openbsd-ecb91bb14f9afd9265d562bfc010da73c32734d6.tar.xz
wireguard-openbsd-ecb91bb14f9afd9265d562bfc010da73c32734d6.zip
Use IPL_MPFLOOR for mutexes that can be taken w/ and w/o the KERNEL_LOCK().
From Mathieu <naabed at poolp.org>, ok visa@, tb@
-rw-r--r--sys/kern/kern_descrip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 746626bb5f0..ca22f5b94e0 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_descrip.c,v 1.160 2018/05/29 08:28:35 mpi Exp $ */
+/* $OpenBSD: kern_descrip.c,v 1.161 2018/05/31 11:38:15 mpi Exp $ */
/* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */
/*
@@ -962,7 +962,7 @@ restart:
* We need to block interrupts as long as `f_mtx' is being taken
* with and without the KERNEL_LOCK().
*/
- mtx_init(&fp->f_mtx, IPL_VM);
+ mtx_init(&fp->f_mtx, IPL_MPFLOOR);
fp->f_iflags = FIF_LARVAL;
if ((fq = p->p_fd->fd_ofiles[0]) != NULL) {
LIST_INSERT_AFTER(fq, fp, f_list);