summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_pool.c
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2017-02-08 05:28:30 +0000
committerdlg <dlg@openbsd.org>2017-02-08 05:28:30 +0000
commite828f349d935077834fb75c9122aca9059a3071d (patch)
treeeeafd7d09dd56bb333804bc04c843b8826b63da1 /sys/kern/subr_pool.c
parentIn exec_elf.c: expand ELFNAME(), ELFNAME2(), and ELFNAMEEND() except (diff)
downloadwireguard-openbsd-e828f349d935077834fb75c9122aca9059a3071d.tar.xz
wireguard-openbsd-e828f349d935077834fb75c9122aca9059a3071d.zip
the splvm() in pool_gc_pages is unecessary now.
all pools set their ipls unconditionally now, so there isn't a need to second guess them. pointed out by and ok jmatthew@
Diffstat (limited to 'sys/kern/subr_pool.c')
-rw-r--r--sys/kern/subr_pool.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index 06955059936..177b4083c8e 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_pool.c,v 1.205 2017/01/24 09:54:41 mpi Exp $ */
+/* $OpenBSD: subr_pool.c,v 1.206 2017/02/08 05:28:30 dlg Exp $ */
/* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */
/*-
@@ -1446,10 +1446,8 @@ pool_gc_pages(void *null)
{
struct pool *pp;
struct pool_page_header *ph, *freeph;
- int s;
rw_enter_read(&pool_lock);
- s = splvm(); /* XXX go to splvm until all pools _setipl properly */
SIMPLEQ_FOREACH(pp, &pool_head, pr_poollist) {
if (pp->pr_nidle <= pp->pr_minpages || /* guess */
!mtx_enter_try(&pp->pr_mtx)) /* try */
@@ -1469,7 +1467,6 @@ pool_gc_pages(void *null)
if (freeph != NULL)
pool_p_free(pp, freeph);
}
- splx(s);
rw_exit_read(&pool_lock);
timeout_add_sec(&pool_gc_tick, 1);