all pools have their ipl set via pool_setipl, so fold it into pool_init.

the ioff argument to pool_init() is unused and has been for many
years, so this replaces it with an ipl argument. because the ipl
will be set on init we no longer need pool_setipl.

most of these changes have been done with coccinelle using the spatch
below. cocci sucks at formatting code though, so i fixed that by hand.

the manpage and subr_pool.c bits i did myself.

ok tedu@ jmatthew@

@ipl@
expression pp;
expression ipl;
expression s, a, o, f, m, p;
@@
-pool_init(pp, s, a, o, f, m, p);
-pool_setipl(pp, ipl);
+pool_init(pp, s, a, ipl, f, m, p);

88 files changed, 405 insertions, 613 deletions

diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index 5d2416b3d0c..48265d41a85 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.83 2016/06/07 06:23:19 dlg Exp $ */
+/* $OpenBSD: pmap.c,v 1.84 2016/09/15 02:00:16 dlg Exp $ */
 /* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */
 
 /*-
@@ -838,15 +838,12 @@ pmap_bootstrap(paddr_t ptaddr, u_int maxasn, u_long ncpuids)
 	 * Initialize the pmap pools and list.
 	 */
 	pmap_ncpuids = ncpuids;
-	pool_init(&pmap_pmap_pool, PMAP_SIZEOF(pmap_ncpuids), 0, 0, 0,
+	pool_init(&pmap_pmap_pool, PMAP_SIZEOF(pmap_ncpuids), 0, IPL_NONE, 0,
 	    "pmappl", &pool_allocator_single);
-	pool_setipl(&pmap_pmap_pool, IPL_NONE);
-	pool_init(&pmap_l1pt_pool, PAGE_SIZE, 0, 0, 0, "l1ptpl",
-	    &pmap_l1pt_allocator);
-	pool_setipl(&pmap_l1pt_pool, IPL_VM);
-	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
-	    &pmap_pv_page_allocator);
-	pool_setipl(&pmap_pv_pool, IPL_VM);
+	pool_init(&pmap_l1pt_pool, PAGE_SIZE, 0, IPL_VM, 0,
+	    "l1ptpl", &pmap_l1pt_allocator);
+	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, IPL_VM, 0,
+	    "pvpl", &pmap_pv_page_allocator);
 
 	TAILQ_INIT(&pmap_all_pmaps);
 
diff --git a/sys/arch/amd64/amd64/aesni.c b/sys/arch/amd64/amd64/aesni.c
index cb65fc9fdf1..b712cdceaef 100644
--- a/sys/arch/amd64/amd64/aesni.c
+++ b/sys/arch/amd64/amd64/aesni.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aesni.c,v 1.38 2016/04/18 21:15:18 kettenis Exp $	*/
+/*	$OpenBSD: aesni.c,v 1.39 2016/09/15 02:00:16 dlg Exp $	*/
 /*-
  * Copyright (c) 2003 Jason Wright
  * Copyright (c) 2003, 2004 Theo de Raadt
@@ -164,9 +164,8 @@ aesni_setup(void)
 		return;
 	}
 
-	pool_init(&aesnipl, sizeof(struct aesni_session), 16, 0, 0,
+	pool_init(&aesnipl, sizeof(struct aesni_session), 16, IPL_VM, 0,
 	    "aesni", NULL);
-	pool_setipl(&aesnipl, IPL_VM);
 	pool_setlowat(&aesnipl, 2);
 
 	mtx_init(&aesni_sc->sc_mtx, IPL_VM);
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c
index 18070a7fc1f..745a65c0b1b 100644
--- a/sys/arch/amd64/amd64/pmap.c
+++ b/sys/arch/amd64/amd64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.99 2016/06/07 06:23:19 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.100 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $	*/
 
 /*
@@ -737,20 +737,18 @@ pmap_bootstrap(paddr_t first_avail, paddr_t max_pa)
 	 * initialize the pmap pool.
 	 */
 
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, IPL_NONE, 0,
 	    "pmappl", NULL);
-	pool_setipl(&pmap_pmap_pool, IPL_NONE);
-	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
-	    &pool_allocator_single);
-	pool_setipl(&pmap_pv_pool, IPL_VM);
+	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, IPL_VM, 0,
+	    "pvpl", &pool_allocator_single);
 	pool_sethiwat(&pmap_pv_pool, 32 * 1024);
 
 	/*
 	 * initialize the PDE pool.
 	 */
 
-	pool_init(&pmap_pdp_pool, PAGE_SIZE, 0, 0, PR_WAITOK, "pdppl", NULL);
-	pool_setipl(&pmap_pdp_pool, IPL_NONE);
+	pool_init(&pmap_pdp_pool, PAGE_SIZE, 0, IPL_NONE, PR_WAITOK,
+	    "pdppl", NULL);
 
 	/*
 	 * ensure the TLB is sync'd with reality by flushing it...
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c
index 9086ddced10..b3f76bad7df 100644
--- a/sys/arch/amd64/amd64/vmm.c
+++ b/sys/arch/amd64/amd64/vmm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmm.c,v 1.83 2016/09/14 18:23:06 mlarkin Exp $	*/
+/*	$OpenBSD: vmm.c,v 1.84 2016/09/15 02:00:16 dlg Exp $	*/
 /*
  * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -334,12 +334,10 @@ vmm_attach(struct device *parent, struct device *self, void *aux)
 		sc->mode = VMM_MODE_UNKNOWN;
 	}
 
-	pool_init(&vm_pool, sizeof(struct vm), 0, 0, PR_WAITOK, "vmpool",
-	    NULL);
-	pool_setipl(&vm_pool, IPL_NONE);
-	pool_init(&vcpu_pool, sizeof(struct vcpu), 0, 0, PR_WAITOK, "vcpupl",
-	    NULL);
-	pool_setipl(&vcpu_pool, IPL_NONE);
+	pool_init(&vm_pool, sizeof(struct vm), 0, IPL_NONE, PR_WAITOK,
+	    "vmpool", NULL);
+	pool_init(&vcpu_pool, sizeof(struct vcpu), 0, IPL_NONE, PR_WAITOK,
+	    "vcpupl", NULL);
 
 	vmm_softc = sc;
 }
diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index 209c6f702b2..3340253cfa2 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.64 2016/06/07 06:23:19 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.65 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -3729,30 +3729,14 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt, vaddr_t vstart, vaddr_t vend)
 	/*
 	 * Initialize the pmap pool and cache
 	 */
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, IPL_NONE, 0,
 	    "pmappl", &pool_allocator_single);
-	pool_setipl(&pmap_pmap_pool, IPL_NONE);
-
-	/*
-	 * Initialize the pv pool.
-	 */
-	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvepl",
-	    &pmap_bootstrap_pv_allocator);
-	pool_setipl(&pmap_pv_pool, IPL_VM);
-
-	/*
-	 * Initialize the L2 dtable pool and cache.
-	 */
-	pool_init(&pmap_l2dtable_pool, sizeof(struct l2_dtable), 0, 0, 0,
+	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, IPL_VM, 0,
+	    "pvepl", &pmap_bootstrap_pv_allocator);
+	pool_init(&pmap_l2dtable_pool, sizeof(struct l2_dtable), 0, IPL_VM, 0,
 	    "l2dtblpl", NULL);
-	pool_setipl(&pmap_l2dtable_pool, IPL_VM);
-
-	/*
-	 * Initialise the L2 descriptor table pool and cache
-	 */
-	pool_init(&pmap_l2ptp_pool, L2_TABLE_SIZE_REAL, L2_TABLE_SIZE_REAL, 0,
-	    0, "l2ptppl", &pool_allocator_single);
-	pool_setipl(&pmap_l2ptp_pool, IPL_VM);
+	pool_init(&pmap_l2ptp_pool, L2_TABLE_SIZE_REAL, L2_TABLE_SIZE_REAL,
+	    IPL_VM, 0, "l2ptppl", &pool_allocator_single);
 
 	cpu_dcache_wbinv_all();
 }
diff --git a/sys/arch/arm/arm/pmap7.c b/sys/arch/arm/arm/pmap7.c
index 30ba0c99b04..b4aaf5f5420 100644
--- a/sys/arch/arm/arm/pmap7.c
+++ b/sys/arch/arm/arm/pmap7.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap7.c,v 1.51 2016/08/31 12:24:12 jsg Exp $	*/
+/*	$OpenBSD: pmap7.c,v 1.52 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -2396,30 +2396,14 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt, vaddr_t vstart, vaddr_t vend)
 	/*
 	 * Initialize the pmap pool.
 	 */
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, IPL_NONE, 0,
 	    "pmappl", &pool_allocator_single);
-	pool_setipl(&pmap_pmap_pool, IPL_NONE);
-
-	/*
-	 * Initialize the pv pool.
-	 */
-	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvepl",
-	    &pmap_bootstrap_pv_allocator);
-	pool_setipl(&pmap_pv_pool, IPL_VM);
-
-	/*
-	 * Initialize the L2 dtable pool.
-	 */
-	pool_init(&pmap_l2dtable_pool, sizeof(struct l2_dtable), 0, 0, 0,
+	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, IPL_VM, 0,
+	    "pvepl", &pmap_bootstrap_pv_allocator);
+	pool_init(&pmap_l2dtable_pool, sizeof(struct l2_dtable), 0, IPL_VM, 0,
 	    "l2dtblpl", NULL);
-	pool_setipl(&pmap_l2dtable_pool, IPL_VM);
-
-	/*
-	 * Initialise the L2 descriptor table pool.
-	 */
-	pool_init(&pmap_l2ptp_pool, L2_TABLE_SIZE_REAL, L2_TABLE_SIZE_REAL, 0,
-	    0, "l2ptppl", &pool_allocator_single);
-	pool_setipl(&pmap_l2ptp_pool, IPL_VM);
+	pool_init(&pmap_l2ptp_pool, L2_TABLE_SIZE_REAL, L2_TABLE_SIZE_REAL,
+	    IPL_VM, 0, "l2ptppl", &pool_allocator_single);
 
 	cpu_dcache_wbinv_all();
 	cpu_sdcache_wbinv_all();
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index 75105b912a3..9e0e0e70e02 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.245 2016/05/21 00:56:43 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.246 2016/09/15 02:00:17 dlg Exp $	*/
 
 /*
  * Copyright (c) 1999-2003 Michael Shalayeff
@@ -390,9 +390,8 @@ hppa_init(paddr_t start)
 	fdcacheall();
 
 	proc0paddr->u_pcb.pcb_fpstate = &proc0fpstate;
-	pool_init(&hppa_fppl, sizeof(struct hppa_fpstate), 16, 0, 0,
+	pool_init(&hppa_fppl, sizeof(struct hppa_fpstate), 16, IPL_NONE, 0,
 	    "hppafp", NULL);
-	pool_setipl(&hppa_fppl, IPL_NONE);
 }
 
 void
diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c
index 0e0146026ba..f85016f34c9 100644
--- a/sys/arch/hppa/hppa/pmap.c
+++ b/sys/arch/hppa/hppa/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.169 2016/06/07 06:23:19 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.170 2016/09/15 02:00:17 dlg Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -631,12 +631,10 @@ pmap_init(void)
 {
 	DPRINTF(PDB_FOLLOW|PDB_INIT, ("pmap_init()\n"));
 
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, IPL_NONE, 0,
 	    "pmappl", NULL);
-	pool_setipl(&pmap_pmap_pool, IPL_NONE);
-	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pmappv",
-	    NULL);
-	pool_setipl(&pmap_pv_pool, IPL_VM);
+	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, IPL_VM, 0,
+	    "pmappv", NULL);
 	pool_setlowat(&pmap_pv_pool, pmap_pvlowat);
 	pool_sethiwat(&pmap_pv_pool, pmap_pvlowat * 32);
 
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index f4f1e2b20c3..8f6b119bf1e 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.190 2016/06/07 06:23:19 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.191 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $	*/
 
 /*
@@ -1026,12 +1026,10 @@ pmap_bootstrap(vaddr_t kva_start)
 	 * initialize the pmap pool.
 	 */
 
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 32, 0, 0,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 32, IPL_NONE, 0,
 	    "pmappl", NULL);
-	pool_setipl(&pmap_pmap_pool, IPL_NONE);
-	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
-	    &pmap_pv_page_allocator);
-	pool_setipl(&pmap_pv_pool, IPL_VM);
+	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, IPL_VM, 0,
+	    "pvpl", &pmap_pv_page_allocator);
 
 	/*
 	 * ensure the TLB is sync'd with reality by flushing it...
diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c
index 26543712155..a8e106f760e 100644
--- a/sys/arch/m88k/m88k/pmap.c
+++ b/sys/arch/m88k/m88k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.83 2016/06/07 06:23:19 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.84 2016/09/15 02:00:17 dlg Exp $	*/
 
 /*
  * Copyright (c) 2001-2004, 2010, Miodrag Vallat.
@@ -865,11 +865,9 @@ void
 pmap_init(void)
 {
 	DPRINTF(CD_INIT, ("pmap_init()\n"));
-	pool_init(&pmappool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_single);
-	pool_setipl(&pmappool, IPL_NONE);
-	pool_init(&pvpool, sizeof(pv_entry_t), 0, 0, 0, "pvpl", NULL);
-	pool_setipl(&pvpool, IPL_VM);
+	pool_init(&pmappool, sizeof(struct pmap), 0, IPL_NONE, 0,
+	    "pmappl", &pool_allocator_single);
+	pool_init(&pvpool, sizeof(pv_entry_t), 0, IPL_VM, 0, "pvpl", NULL);
 }
 
 /*
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index b296e3d9f9e..8467e3549b0 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.176 2016/05/21 00:56:43 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.177 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -324,8 +324,8 @@ initppc(startkernel, endkernel, args)
 	ofwconprobe();
 	consinit();
 
-        pool_init(&ppc_vecpl, sizeof(struct vreg), 16, 0, 0, "ppcvec", NULL);
-	pool_setipl(&ppc_vecpl, IPL_NONE);
+        pool_init(&ppc_vecpl, sizeof(struct vreg), 16, IPL_NONE, 0, "ppcvec",
+	    NULL);
 
 }
 
diff --git a/sys/arch/mips64/mips64/pmap.c b/sys/arch/mips64/mips64/pmap.c
index d8b96a46910..e4a400b4480 100644
--- a/sys/arch/mips64/mips64/pmap.c
+++ b/sys/arch/mips64/mips64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.91 2016/08/14 08:23:52 visa Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.92 2016/09/15 02:00:17 dlg Exp $	*/
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -356,13 +356,12 @@ pmap_bootstrap(void)
 	Sysmap = (pt_entry_t *)
 	    uvm_pageboot_alloc(sizeof(pt_entry_t) * Sysmapsize);
 
-	pool_init(&pmap_pmap_pool, PMAP_SIZEOF(ncpusfound), 0, 0, 0,"pmappl", NULL);
-	pool_setipl(&pmap_pmap_pool, IPL_NONE);
-	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0,"pvpl", NULL);
-	pool_setipl(&pmap_pv_pool, IPL_VM);
-	pool_init(&pmap_pg_pool, PMAP_L2SIZE, PMAP_L2SIZE, 0, 0, "pmappgpl",
-	    &pmap_pg_allocator);
-	pool_setipl(&pmap_pg_pool, IPL_VM);
+	pool_init(&pmap_pmap_pool, PMAP_SIZEOF(ncpusfound), 0, IPL_NONE, 0,
+	    "pmappl", NULL);
+	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, IPL_VM, 0,
+	    "pvpl", NULL);
+	pool_init(&pmap_pg_pool, PMAP_L2SIZE, PMAP_L2SIZE, IPL_VM, 0,
+	    "pmappgpl", &pmap_pg_allocator);
 
 	pmap_kernel()->pm_count = 1;
 
diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index 4c2c757c27a..ef9624a4f1d 100644
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.164 2016/06/07 06:23:19 dlg Exp $ */
+/*	$OpenBSD: pmap.c,v 1.165 2016/09/15 02:00:17 dlg Exp $ */
 
 /*
  * Copyright (c) 2015 Martin Pieuchot
@@ -2142,17 +2142,14 @@ pmap_real_memory(paddr_t *start, vsize_t *size)
 void
 pmap_init()
 {
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, IPL_NONE, 0,
 	    "pmap", NULL);
-	pool_setipl(&pmap_pmap_pool, IPL_NONE);
 	pool_setlowat(&pmap_pmap_pool, 2);
-	pool_init(&pmap_vp_pool, sizeof(struct pmapvp), 0, 0, 0, "vp",
-	    &pool_allocator_single);
-	pool_setipl(&pmap_vp_pool, IPL_VM);
+	pool_init(&pmap_vp_pool, sizeof(struct pmapvp), 0, IPL_VM, 0,
+	    "vp", &pool_allocator_single);
 	pool_setlowat(&pmap_vp_pool, 10);
-	pool_init(&pmap_pted_pool, sizeof(struct pte_desc), 0, 0, 0, "pted",
-	    NULL);
-	pool_setipl(&pmap_pted_pool, IPL_VM);
+	pool_init(&pmap_pted_pool, sizeof(struct pte_desc), 0, IPL_VM, 0,
+	    "pted", NULL);
 	pool_setlowat(&pmap_pted_pool, 20);
 
 	PMAP_HASH_LOCK_INIT();
diff --git a/sys/arch/sh/sh/pmap.c b/sys/arch/sh/sh/pmap.c
index dca62bc3989..5599bd4230c 100644
--- a/sys/arch/sh/sh/pmap.c
+++ b/sys/arch/sh/sh/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.25 2016/06/07 06:23:19 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.26 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: pmap.c,v 1.55 2006/08/07 23:19:36 tsutsui Exp $	*/
 
 /*-
@@ -203,12 +203,10 @@ void
 pmap_init(void)
 {
 	/* Initialize pmap module */
-	pool_init(&__pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0,
+	pool_init(&__pmap_pmap_pool, sizeof(struct pmap), 0, IPL_NONE, 0,
 	    "pmappl", &pool_allocator_single);
-	pool_setipl(&__pmap_pmap_pool, IPL_NONE);
-	pool_init(&__pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
-	    &pmap_pv_page_allocator);
-	pool_setipl(&__pmap_pv_pool, IPL_VM);
+	pool_init(&__pmap_pv_pool, sizeof(struct pv_entry), 0, IPL_VM, 0,
+	    "pvpl", &pmap_pv_page_allocator);
 	pool_setlowat(&__pmap_pv_pool, 16);
 }
 
diff --git a/sys/arch/sparc64/dev/vnet.c b/sys/arch/sparc64/dev/vnet.c
index d9ebb58e7f1..fbd8cd4caa1 100644
--- a/sys/arch/sparc64/dev/vnet.c
+++ b/sys/arch/sparc64/dev/vnet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnet.c,v 1.56 2016/04/13 11:34:00 mpi Exp $	*/
+/*	$OpenBSD: vnet.c,v 1.57 2016/09/15 02:00:17 dlg Exp $	*/
 /*
  * Copyright (c) 2009, 2015 Mark Kettenis
  *
@@ -304,8 +304,7 @@ vnet_attach(struct device *parent, struct device *self, void *aux)
 	/*
 	 * Each interface gets its own pool.
 	 */
-	pool_init(&sc->sc_pool, 2048, 0, 0, 0, sc->sc_dv.dv_xname, NULL);
-	pool_setipl(&sc->sc_pool, IPL_NET);
+	pool_init(&sc->sc_pool, 2048, 0, IPL_NET, 0, sc->sc_dv.dv_xname, NULL);
 
 	ifp = &sc->sc_ac.ac_if;
 	ifp->if_softc = sc;
diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c
index e2a656cc22c..c8954c3ecfc 100644
--- a/sys/arch/sparc64/sparc64/pmap.c
+++ b/sys/arch/sparc64/sparc64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.97 2016/06/07 06:23:19 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.98 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $	*/
 #undef	NO_VCACHE /* Don't forget the locked TLB in dostart */
 /*
@@ -1378,11 +1378,10 @@ pmap_init(void)
 		panic("pmap_init: CLSIZE!=1");
 
 	/* Setup a pool for additional pvlist structures */
-	pool_init(&pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pv_entry", NULL);
-	pool_setipl(&pv_pool, IPL_VM);
-	pool_init(&pmap_pool, sizeof(struct pmap), 0, 0, 0,
+	pool_init(&pv_pool, sizeof(struct pv_entry), 0, IPL_VM, 0,
+	    "pv_entry", NULL);
+	pool_init(&pmap_pool, sizeof(struct pmap), 0, IPL_NONE, 0,
 	    "pmappl", NULL);
-	pool_setipl(&pmap_pool, IPL_NONE);
 }
 
 /* Start of non-cachable physical memory on UltraSPARC-III. */
diff --git a/sys/crypto/crypto.c b/sys/crypto/crypto.c
index 3c1b21c88b8..b8f2e3a48ea 100644
--- a/sys/crypto/crypto.c
+++ b/sys/crypto/crypto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypto.c,v 1.76 2016/04/18 21:05:55 kettenis Exp $	*/
+/*	$OpenBSD: crypto.c,v 1.77 2016/09/15 02:00:17 dlg Exp $	*/
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -513,12 +513,10 @@ crypto_init(void)
 	crypto_taskq = taskq_create("crypto", 1, IPL_VM, 0);
 	crypto_taskq_mpsafe = taskq_create("crynlk", 1, IPL_VM|IPL_MPSAFE, 0);
 
-	pool_init(&cryptop_pool, sizeof(struct cryptop), 0, 0,
-	    0, "cryptop", NULL);
-	pool_setipl(&cryptop_pool, IPL_VM);
-	pool_init(&cryptodesc_pool, sizeof(struct cryptodesc), 0, 0,
-	    0, "cryptodesc", NULL);
-	pool_setipl(&cryptodesc_pool, IPL_VM);
+	pool_init(&cryptop_pool, sizeof(struct cryptop), 0, IPL_VM, 0,
+	    "cryptop", NULL);
+	pool_init(&cryptodesc_pool, sizeof(struct cryptodesc), 0, IPL_VM, 0,
+	    "cryptodesc", NULL);
 }
 
 /*
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index 96ecda264d3..1d42d20101d 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardslot.c,v 1.20 2016/08/24 09:31:56 dlg Exp $	*/
+/*	$OpenBSD: cardslot.c,v 1.21 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $	*/
 
 /*
@@ -103,8 +103,7 @@ cardslotattach(struct device *parent, struct device *self, void *aux)
 
 	if (cardsloteventpool.pr_size == 0) {
 		pool_init(&cardsloteventpool, sizeof(struct cardslot_event),
-		    0, 0, 0, "cardslot", NULL);
-		pool_setipl(&cardsloteventpool, IPL_BIO);
+		    0, IPL_BIO, 0, "cardslot", NULL);
 	}
 
 	sc->sc_slot = sc->sc_dev.dv_unit;
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 75d79d04302..fa00dbf7453 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9x.c,v 1.62 2016/08/23 03:28:01 guenther Exp $	*/
+/*	$OpenBSD: ncr53c9x.c,v 1.63 2016/09/15 02:00:17 dlg Exp $	*/
 /*     $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $    */
 
 /*
@@ -392,9 +392,8 @@ ncr53c9x_init(sc, doreset)
 
 	if (!ecb_pool_initialized) {
 		/* All instances share this pool */
-		pool_init(&ecb_pool, sizeof(struct ncr53c9x_ecb), 0, 0, 0,
-		    "ncr53c9x_ecb", NULL);
-		pool_setipl(&ecb_pool, IPL_BIO);
+		pool_init(&ecb_pool, sizeof(struct ncr53c9x_ecb), 0, IPL_BIO,
+		    0, "ncr53c9x_ecb", NULL);
 		scsi_iopool_init(&ecb_iopool, NULL,
 		    ncr53c9x_get_ecb, ncr53c9x_free_ecb);
 		ecb_pool_initialized = 1;
diff --git a/sys/dev/ic/wd33c93.c b/sys/dev/ic/wd33c93.c
index 946cf95f3cb..99f6bfd8ccd 100644
--- a/sys/dev/ic/wd33c93.c
+++ b/sys/dev/ic/wd33c93.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd33c93.c,v 1.7 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: wd33c93.c,v 1.8 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: wd33c93.c,v 1.24 2010/11/13 13:52:02 uebayasi Exp $	*/
 
 /*
@@ -229,9 +229,8 @@ wd33c93_init(struct wd33c93_softc *sc)
 
 	if (!wd33c93_pool_initialized) {
 		/* All instances share the same pool */
-		pool_init(&wd33c93_pool, sizeof(struct wd33c93_acb), 0, 0, 0,
-		    "wd33c93_acb", NULL);
-		pool_setipl(&wd33c93_pool, IPL_BIO);
+		pool_init(&wd33c93_pool, sizeof(struct wd33c93_acb), 0,
+		    IPL_BIO, 0, "wd33c93_acb", NULL);
 		scsi_iopool_init(&wd33c93_iopool, NULL,
 		    wd33c93_io_get, wd33c93_io_put);
 		++wd33c93_pool_initialized;
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index fdc08058fd5..e2b0a159f40 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc.c,v 1.130 2015/08/28 00:03:53 deraadt Exp $	*/
+/*	$OpenBSD: wdc.c,v 1.131 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -713,9 +713,8 @@ wdc_alloc_queue(void)
 	/* Initialize global data. */
 	if (inited == 0) {
 		/* Initialize the wdc_xfer pool. */
-		pool_init(&wdc_xfer_pool, sizeof(struct wdc_xfer), 0,
-		    0, 0, "wdcxfer", NULL);
-		pool_setipl(&wdc_xfer_pool, IPL_BIO);
+		pool_init(&wdc_xfer_pool, sizeof(struct wdc_xfer), 0, IPL_BIO,
+		    0, "wdcxfer", NULL);
 		scsi_iopool_init(&wdc_xfer_iopool, NULL,
 		    wdc_xfer_get, wdc_xfer_put);
 		inited = 1;
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 52c191a0258..fd273b55ba0 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: drm_drv.c,v 1.148 2016/08/24 09:31:56 dlg Exp $ */
+/* $OpenBSD: drm_drv.c,v 1.149 2016/09/15 02:00:17 dlg Exp $ */
 /*-
  * Copyright 2007-2009 Owain G. Ainsworth <oga@openbsd.org>
  * Copyright © 2008 Intel Corporation
@@ -436,9 +436,8 @@ drm_attach(struct device *parent, struct device *self, void *aux)
 	if (dev->driver->driver_features & DRIVER_GEM) {
 		KASSERT(dev->driver->gem_size >= sizeof(struct drm_gem_object));
 		/* XXX unique name */
-		pool_init(&dev->objpl, dev->driver->gem_size, 0, 0, 0,
+		pool_init(&dev->objpl, dev->driver->gem_size, 0, IPL_NONE, 0,
 		    "drmobjpl", NULL);
-		pool_setipl(&dev->objpl, IPL_NONE);
 	}
 
 	if (dev->driver->driver_features & DRIVER_GEM) {
diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c
index 1591351475e..c01495da3d2 100644
--- a/sys/dev/pci/drm/drm_linux.c
+++ b/sys/dev/pci/drm/drm_linux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: drm_linux.c,v 1.11 2016/04/07 20:30:59 kettenis Exp $	*/
+/*	$OpenBSD: drm_linux.c,v 1.12 2016/09/15 02:00:17 dlg Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan Gray <jsg@openbsd.org>
  * Copyright (c) 2015, 2016 Mark Kettenis <kettenis@openbsd.org>
@@ -240,9 +240,8 @@ idr_init(struct idr *idr)
 	static int initialized;
 
 	if (!initialized) {
-		pool_init(&idr_pool, sizeof(struct idr_entry), 0, 0, 0,
+		pool_init(&idr_pool, sizeof(struct idr_entry), 0, IPL_TTY, 0,
 		    "idrpl", NULL);
-		pool_setipl(&idr_pool, IPL_TTY);
 		initialized = 1;
 	}
 	SPLAY_INIT(&idr->tree);
diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c
index cae0b82daa3..f6ec1af9830 100644
--- a/sys/dev/pci/if_myx.c
+++ b/sys/dev/pci/if_myx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_myx.c,v 1.95 2016/05/23 15:22:44 tedu Exp $	*/
+/*	$OpenBSD: if_myx.c,v 1.96 2016/09/15 02:00:17 dlg Exp $	*/
 
 /*
  * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -302,9 +302,8 @@ myx_attach(struct device *parent, struct device *self, void *aux)
 			    DEVNAME(sc));
 			goto unmap;
 		}
-		pool_init(myx_mcl_pool, MYX_RXBIG_SIZE, MYX_BOUNDARY, 0,
+		pool_init(myx_mcl_pool, MYX_RXBIG_SIZE, MYX_BOUNDARY, IPL_NET,
 		    0, "myxmcl", NULL);
-		pool_setipl(myx_mcl_pool, IPL_NET);
 		pool_set_constraints(myx_mcl_pool, &kp_dma_contig);
 	}
 
diff --git a/sys/dev/pci/if_nep.c b/sys/dev/pci/if_nep.c
index 62417f15776..e0fa899c393 100644
--- a/sys/dev/pci/if_nep.c
+++ b/sys/dev/pci/if_nep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nep.c,v 1.25 2016/05/23 15:22:44 tedu Exp $	*/
+/*	$OpenBSD: if_nep.c,v 1.26 2016/09/15 02:00:17 dlg Exp $	*/
 /*
  * Copyright (c) 2014, 2015 Mark Kettenis
  *
@@ -605,9 +605,8 @@ nep_attach(struct device *parent, struct device *self, void *aux)
 			    sc->sc_dev.dv_xname);
 			return;
 		}
-		pool_init(nep_block_pool, PAGE_SIZE, 0, 0, 0,
+		pool_init(nep_block_pool, PAGE_SIZE, 0, IPL_NET, 0,
 		    "nepblk", NULL);
-		pool_setipl(nep_block_pool, IPL_NET);
 	}
 
 	val = nep_read(sc, MIF_CONFIG);
diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c
index cceb3be45ac..3e7a908dfd4 100644
--- a/sys/dev/pci/if_oce.c
+++ b/sys/dev/pci/if_oce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_oce.c,v 1.97 2016/09/14 19:04:54 mikeb Exp $	*/
+/*	$OpenBSD: if_oce.c,v 1.98 2016/09/15 02:00:17 dlg Exp $	*/
 
 /*
  * Copyright (c) 2012 Mike Belopuhov
@@ -586,9 +586,8 @@ oce_attach(struct device *parent, struct device *self, void *aux)
 			printf(": unable to allocate descriptor pool\n");
 			goto fail_2;
 		}
-		pool_init(oce_pkt_pool, sizeof(struct oce_pkt), 0, 0, 0,
-		    "ocepkts", NULL);
-		pool_setipl(oce_pkt_pool, IPL_NET);
+		pool_init(oce_pkt_pool, sizeof(struct oce_pkt), 0, IPL_NET,
+		    0, "ocepkts", NULL);
 	}
 
 	/* We allocate a single interrupt resource */
diff --git a/sys/dev/usb/dwc2/dwc2.c b/sys/dev/usb/dwc2/dwc2.c
index 354e713ed82..55dc4a00afb 100644
--- a/sys/dev/usb/dwc2/dwc2.c
+++ b/sys/dev/usb/dwc2/dwc2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwc2.c,v 1.36 2015/12/23 12:38:40 visa Exp $	*/
+/*	$OpenBSD: dwc2.c,v 1.37 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $	*/
 
 /*-
@@ -1563,15 +1563,12 @@ dwc2_init(struct dwc2_softc *sc)
 	    USB_MEM_RESERVE);
 #endif
 
-	pool_init(&sc->sc_xferpool, sizeof(struct dwc2_xfer), 0, 0, 0,
+	pool_init(&sc->sc_xferpool, sizeof(struct dwc2_xfer), 0, IPL_USB, 0,
 	    "dwc2xfer", NULL);
-	pool_setipl(&sc->sc_xferpool, IPL_USB);
-	pool_init(&sc->sc_qhpool, sizeof(struct dwc2_qh), 0, 0, 0,
+	pool_init(&sc->sc_qhpool, sizeof(struct dwc2_qh), 0, IPL_USB, 0,
 	    "dwc2qh", NULL);
-	pool_setipl(&sc->sc_qhpool, IPL_USB);
-	pool_init(&sc->sc_qtdpool, sizeof(struct dwc2_qtd), 0, 0, 0,
+	pool_init(&sc->sc_qtdpool, sizeof(struct dwc2_qtd), 0, IPL_USB, 0,
 	    "dwc2qtd", NULL);
-	pool_setipl(&sc->sc_qtdpool, IPL_USB);
 
 	sc->sc_hsotg = malloc(sizeof(struct dwc2_hsotg), M_DEVBUF,
 	    M_ZERO | M_WAITOK);
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 0daf622b3ba..2d5c461cdad 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci.c,v 1.192 2016/08/18 11:59:58 jsg Exp $ */
+/*	$OpenBSD: ehci.c,v 1.193 2016/09/15 02:00:17 dlg Exp $ */
 /*	$NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $	*/
 
 /*
@@ -338,9 +338,8 @@ ehci_init(struct ehci_softc *sc)
 			    sc->sc_bus.bdev.dv_xname);
 			return (ENOMEM);
 		}
-		pool_init(ehcixfer, sizeof(struct ehci_xfer), 0, 0, 0,
-		    "ehcixfer", NULL);
-		pool_setipl(ehcixfer, IPL_SOFTUSB);
+		pool_init(ehcixfer, sizeof(struct ehci_xfer), 0, IPL_SOFTUSB,
+		    0, "ehcixfer", NULL);
 	}
 
 	/* frame list size at default, read back what we got and use that */
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 47f4a607278..c955b5b3087 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci.c,v 1.146 2015/12/02 09:43:03 yasuoka Exp $ */
+/*	$OpenBSD: ohci.c,v 1.147 2016/09/15 02:00:17 dlg Exp $ */
 /*	$NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
@@ -724,9 +724,8 @@ ohci_init(struct ohci_softc *sc)
 			    sc->sc_bus.bdev.dv_xname);
 			return (ENOMEM);
 		}
-		pool_init(ohcixfer, sizeof(struct ohci_xfer), 0, 0, 0,
-		    "ohcixfer", NULL);
-		pool_setipl(ohcixfer, IPL_SOFTUSB);
+		pool_init(ohcixfer, sizeof(struct ohci_xfer), 0, IPL_SOFTUSB,
+		    0, "ohcixfer", NULL);
 	}
 
 	/* XXX determine alignment by R/W */
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 01437345118..3d9da9b4805 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci.c,v 1.138 2015/06/26 11:17:34 mpi Exp $	*/
+/*	$OpenBSD: uhci.c,v 1.139 2016/09/15 02:00:17 dlg Exp $	*/
 /*	$NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -370,9 +370,8 @@ uhci_init(struct uhci_softc *sc)
 			    sc->sc_bus.bdev.dv_xname);
 			return (ENOMEM);
 		}
-		pool_init(uhcixfer, sizeof(struct uhci_xfer), 0, 0, 0,
-		    "uhcixfer", NULL);
-		pool_setipl(uhcixfer, IPL_SOFTUSB);
+		pool_init(uhcixfer, sizeof(struct uhci_xfer), 0, IPL_SOFTUSB,
+		    0, "uhcixfer", NULL);
 	}
 
 	/* Restore saved SOF. */
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index 358ccf4794f..2ae393c0c6c 100644
--- a/sys/dev/usb/xhci.c
+++ b/sys/dev/usb/xhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xhci.c,v 1.66 2015/12/02 09:23:23 mpi Exp $ */
+/* $OpenBSD: xhci.c,v 1.67 2016/09/15 02:00:17 dlg Exp $ */
 
 /*
  * Copyright (c) 2014-2015 Martin Pieuchot
@@ -311,9 +311,8 @@ xhci_init(struct xhci_softc *sc)
 			    DEVNAME(sc));
 			return (ENOMEM);
 		}
-		pool_init(xhcixfer, sizeof(struct xhci_xfer), 0, 0, 0,
-		    "xhcixfer", NULL);
-		pool_setipl(xhcixfer, IPL_SOFTUSB);
+		pool_init(xhcixfer, sizeof(struct xhci_xfer), 0, IPL_SOFTUSB,
+		    0, "xhcixfer", NULL);
 	}
 
 	hcr = XREAD4(sc, XHCI_HCCPARAMS);
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c
index 6c6dcf143e1..48a700636d6 100644
--- a/sys/dev/vscsi.c
+++ b/sys/dev/vscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vscsi.c,v 1.39 2015/08/27 18:54:02 deraadt Exp $ */
+/*	$OpenBSD: vscsi.c,v 1.40 2016/09/15 02:00:17 dlg Exp $ */
 
 /*
  * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -269,9 +269,8 @@ vscsiopen(dev_t dev, int flags, int mode, struct proc *p)
 		return (rv);
 	}
 
-	pool_init(&sc->sc_ccb_pool, sizeof(struct vscsi_ccb), 0, 0, 0,
+	pool_init(&sc->sc_ccb_pool, sizeof(struct vscsi_ccb), 0, IPL_BIO, 0,
 	    "vscsiccb", NULL);
-	pool_setipl(&sc->sc_ccb_pool, IPL_BIO);
 
 	/* we need to guarantee some ccbs will be available for the iopool */
 	rv = pool_prime(&sc->sc_ccb_pool, 8);
diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c
index 45df2b77535..d7ecaf4d8d9 100644
--- a/sys/isofs/udf/udf_vfsops.c
+++ b/sys/isofs/udf/udf_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf_vfsops.c,v 1.55 2016/09/07 17:30:12 natano Exp $	*/
+/*	$OpenBSD: udf_vfsops.c,v 1.56 2016/09/15 02:00:18 dlg Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -102,15 +102,12 @@ const struct vfsops udf_vfsops = {
 int
 udf_init(struct vfsconf *foo)
 {
-	pool_init(&udf_trans_pool, MAXNAMLEN * sizeof(unicode_t), 0, 0,
+	pool_init(&udf_trans_pool, MAXNAMLEN * sizeof(unicode_t), 0, IPL_NONE,
 	    PR_WAITOK, "udftrpl", NULL);
-	pool_setipl(&udf_trans_pool, IPL_NONE);
-	pool_init(&unode_pool, sizeof(struct unode), 0, 0,
+	pool_init(&unode_pool, sizeof(struct unode), 0, IPL_NONE,
 	    PR_WAITOK, "udfndpl", NULL);
-	pool_setipl(&unode_pool, IPL_NONE);
-	pool_init(&udf_ds_pool, sizeof(struct udf_dirstream), 0, 0,
+	pool_init(&udf_ds_pool, sizeof(struct udf_dirstream), 0, IPL_NONE,
 	    PR_WAITOK, "udfdspl", NULL);
-	pool_setipl(&udf_ds_pool, IPL_NONE);
 
 	return (0);
 }
diff --git a/sys/kern/dma_alloc.c b/sys/kern/dma_alloc.c
index 94329b05e0f..08e5e56ca04 100644
--- a/sys/kern/dma_alloc.c
+++ b/sys/kern/dma_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma_alloc.c,v 1.12 2014/07/08 17:19:25 deraadt Exp $	 */
+/*	$OpenBSD: dma_alloc.c,v 1.13 2016/09/15 02:00:16 dlg Exp $	 */
 
 /*
  * Copyright (c) 2010 Theo de Raadt <deraadt@openbsd.org>
@@ -38,10 +38,9 @@ dma_alloc_init(void)
 	for (i = 0; i < nitems(dmapools); i++) {
 		snprintf(dmanames[i], sizeof(dmanames[0]), "dma%d",
 		    1 << (i + DMA_BUCKET_OFFSET));
-		pool_init(&dmapools[i], 1 << (i + DMA_BUCKET_OFFSET), 0, 0, 0,
-		    dmanames[i], NULL);
+		pool_init(&dmapools[i], 1 << (i + DMA_BUCKET_OFFSET), 0,
+		    IPL_VM, 0, dmanames[i], NULL);
 		pool_set_constraints(&dmapools[i], &kp_dma_contig);
-		pool_setipl(&dmapools[i], IPL_VM);
 		/* XXX need pool_setlowat(&dmapools[i], dmalowat); */
 	}
 }
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 8f00d541b77..19e26f27c55 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_descrip.c,v 1.134 2016/08/25 00:00:02 dlg Exp $	*/
+/*	$OpenBSD: kern_descrip.c,v 1.135 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $	*/
 
 /*
@@ -83,12 +83,10 @@ struct pool fdesc_pool;
 void
 filedesc_init(void)
 {
-	pool_init(&file_pool, sizeof(struct file), 0, 0, PR_WAITOK,
-	    "filepl", NULL);
-	pool_setipl(&file_pool, IPL_NONE);
-	pool_init(&fdesc_pool, sizeof(struct filedesc0), 0, 0, PR_WAITOK,
-	    "fdescpl", NULL);
-	pool_setipl(&fdesc_pool, IPL_NONE);
+	pool_init(&file_pool, sizeof(struct file), 0, IPL_NONE,
+	    PR_WAITOK, "filepl", NULL);
+	pool_init(&fdesc_pool, sizeof(struct filedesc0), 0, IPL_NONE,
+	    PR_WAITOK, "fdescpl", NULL);
 	LIST_INIT(&filehead);
 }
 
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index b555914e25d..b4390697754 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_event.c,v 1.75 2016/08/25 00:00:02 dlg Exp $	*/
+/*	$OpenBSD: kern_event.c,v 1.76 2016/09/15 02:00:16 dlg Exp $	*/
 
 /*-
  * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
@@ -163,12 +163,10 @@ void
 kqueue_init(void)
 {
 
-	pool_init(&kqueue_pool, sizeof(struct kqueue), 0, 0, PR_WAITOK,
+	pool_init(&kqueue_pool, sizeof(struct kqueue), 0, IPL_NONE, PR_WAITOK,
 	    "kqueuepl", NULL);
-	pool_setipl(&kqueue_pool, IPL_NONE);
-	pool_init(&knote_pool, sizeof(struct knote), 0, 0, PR_WAITOK,
+	pool_init(&knote_pool, sizeof(struct knote), 0, IPL_NONE, PR_WAITOK,
 	    "knotepl", NULL);
-	pool_setipl(&knote_pool, IPL_NONE);
 }
 
 int
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index eb9b7ca37f5..51a428d2af8 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_proc.c,v 1.69 2016/09/02 18:11:28 tedu Exp $	*/
+/*	$OpenBSD: kern_proc.c,v 1.70 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: kern_proc.c,v 1.14 1996/02/09 18:59:41 christos Exp $	*/
 
 /*
@@ -93,24 +93,18 @@ procinit(void)
 	if (!pidhashtbl || !pgrphashtbl || !uihashtbl)
 		panic("procinit: malloc");
 
-	pool_init(&proc_pool, sizeof(struct proc), 0, 0, PR_WAITOK,
-	    "procpl", NULL);
-	pool_setipl(&proc_pool, IPL_NONE);
-	pool_init(&process_pool, sizeof(struct process), 0, 0, PR_WAITOK,
-	    "processpl", NULL);
-	pool_setipl(&process_pool, IPL_NONE);
-	pool_init(&rusage_pool, sizeof(struct rusage), 0, 0, PR_WAITOK,
-	    "zombiepl", NULL);
-	pool_setipl(&rusage_pool, IPL_NONE);
-	pool_init(&ucred_pool, sizeof(struct ucred), 0, 0, PR_WAITOK,
-	    "ucredpl", NULL);
-	pool_setipl(&ucred_pool, IPL_NONE);
-	pool_init(&pgrp_pool, sizeof(struct pgrp), 0, 0, PR_WAITOK,
-	    "pgrppl", NULL);
-	pool_setipl(&pgrp_pool, IPL_NONE);
-	pool_init(&session_pool, sizeof(struct session), 0, 0, PR_WAITOK,
-	    "sessionpl", NULL);
-	pool_setipl(&session_pool, IPL_NONE);
+	pool_init(&proc_pool, sizeof(struct proc), 0, IPL_NONE,
+	    PR_WAITOK, "procpl", NULL);
+	pool_init(&process_pool, sizeof(struct process), 0, IPL_NONE,
+	    PR_WAITOK, "processpl", NULL);
+	pool_init(&rusage_pool, sizeof(struct rusage), 0, IPL_NONE,
+	    PR_WAITOK, "zombiepl", NULL);
+	pool_init(&ucred_pool, sizeof(struct ucred), 0, IPL_NONE,
+	    PR_WAITOK, "ucredpl", NULL);
+	pool_init(&pgrp_pool, sizeof(struct pgrp), 0, IPL_NONE,
+	    PR_WAITOK, "pgrppl", NULL);
+	pool_init(&session_pool, sizeof(struct session), 0, IPL_NONE,
+	    PR_WAITOK, "sessionpl", NULL);
 }
 
 struct uidinfo *
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 74a7cc73c34..b1601596aba 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_resource.c,v 1.56 2016/08/25 00:00:02 dlg Exp $	*/
+/*	$OpenBSD: kern_resource.c,v 1.57 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: kern_resource.c,v 1.38 1996/10/23 07:19:38 matthias Exp $	*/
 
 /*-
@@ -506,9 +506,8 @@ limcopy(struct plimit *lim)
 	static int initialized;
 
 	if (!initialized) {
-		pool_init(&plimit_pool, sizeof(struct plimit), 0, 0, PR_WAITOK,
-		    "plimitpl", NULL);
-		pool_setipl(&plimit_pool, IPL_NONE);
+		pool_init(&plimit_pool, sizeof(struct plimit), 0, IPL_NONE,
+		    PR_WAITOK, "plimitpl", NULL);
 		initialized = 1;
 	}
 
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index ac06d6eff6c..74ded876432 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.204 2016/09/04 17:22:40 jsing Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.205 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -152,9 +152,8 @@ signal_init(void)
 {
 	timeout_set(&proc_stop_to, proc_stop_sweep, NULL);
 
-	pool_init(&sigacts_pool, sizeof(struct sigacts), 0, 0, PR_WAITOK,
-	    "sigapl", NULL);
-	pool_setipl(&sigacts_pool, IPL_NONE);
+	pool_init(&sigacts_pool, sizeof(struct sigacts), 0, IPL_NONE,
+	    PR_WAITOK, "sigapl", NULL);
 }
 
 /*
diff --git a/sys/kern/kern_srp.c b/sys/kern/kern_srp.c
index b43b42ae6e4..6900fd30557 100644
--- a/sys/kern/kern_srp.c
+++ b/sys/kern/kern_srp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_srp.c,v 1.10 2016/06/01 03:34:32 dlg Exp $ */
+/*	$OpenBSD: kern_srp.c,v 1.11 2016/09/15 02:00:16 dlg Exp $ */
 
 /*
  * Copyright (c) 2014 Jonathan Matthew <jmatthew@openbsd.org>
@@ -106,11 +106,8 @@ struct pool srp_gc_ctx_pool;
 void
 srp_startup(void)
 {
-	pool_init(&srp_gc_ctx_pool, sizeof(struct srp_gc_ctx), 0, 0,
-	    PR_WAITOK, "srpgc", NULL);
-
-	/* items are allocated in a process, but freed from a timeout */
-	pool_setipl(&srp_gc_ctx_pool, IPL_SOFTCLOCK);
+	pool_init(&srp_gc_ctx_pool, sizeof(struct srp_gc_ctx), 0,
+	    IPL_SOFTCLOCK, PR_WAITOK, "srpgc", NULL);
 }
 
 int
diff --git a/sys/kern/subr_extent.c b/sys/kern/subr_extent.c
index d123c3f0f49..29bdf548d04 100644
--- a/sys/kern/subr_extent.c
+++ b/sys/kern/subr_extent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_extent.c,v 1.57 2015/08/28 00:03:53 deraadt Exp $	*/
+/*	$OpenBSD: subr_extent.c,v 1.58 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: subr_extent.c,v 1.7 1996/11/21 18:46:34 cgd Exp $	*/
 
 /*-
@@ -66,7 +66,6 @@ struct pool {
 };
 
 #define	pool_init(a, b, c, d, e, f, g)	do { (a)->pr_size = (b); } while (0)
-#define	pool_setipl(pp, ipl)		/* nothing */
 #define pool_get(pp, flags)		malloc((pp)->pr_size, 0, 0)
 #define	pool_put(pp, rp)		free((rp), 0, 0)
 
@@ -137,9 +136,8 @@ extent_pool_init(void)
 	static int inited;
 
 	if (!inited) {
-		pool_init(&ex_region_pl, sizeof(struct extent_region), 0, 0, 0,
-		    "extentpl", NULL);
-		pool_setipl(&ex_region_pl, IPL_VM);
+		pool_init(&ex_region_pl, sizeof(struct extent_region), 0,
+		    IPL_VM, 0, "extentpl", NULL);
 		inited = 1;
 	}
 }
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index ea14aa06902..95197120db1 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_pool.c,v 1.197 2016/09/15 01:24:08 dlg Exp $	*/
+/*	$OpenBSD: subr_pool.c,v 1.198 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $	*/
 
 /*-
@@ -220,14 +220,13 @@ pr_find_pagehead(struct pool *pp, void *v)
  * static pools that must be initialized before malloc() is available.
  */
 void
-pool_init(struct pool *pp, size_t size, u_int align, u_int ioff, int flags,
+pool_init(struct pool *pp, size_t size, u_int align, int ipl, int flags,
     const char *wchan, struct pool_allocator *palloc)
 {
 	int off = 0, space;
 	unsigned int pgsize = PAGE_SIZE, items;
 #ifdef DIAGNOSTIC
 	struct pool *iter;
-	KASSERT(ioff == 0);
 #endif
 
 	if (align == 0)
@@ -313,15 +312,14 @@ pool_init(struct pool *pp, size_t size, u_int align, u_int ioff, int flags,
 	pp->pr_hiwat = 0;
 	pp->pr_nidle = 0;
 
-	pp->pr_ipl = -1;
-	mtx_init(&pp->pr_mtx, IPL_NONE);
-	mtx_init(&pp->pr_requests_mtx, IPL_NONE);
+	pp->pr_ipl = ipl;
+	mtx_init(&pp->pr_mtx, pp->pr_ipl);
+	mtx_init(&pp->pr_requests_mtx, pp->pr_ipl);
 	TAILQ_INIT(&pp->pr_requests);
 
 	if (phpool.pr_size == 0) {
-		pool_init(&phpool, sizeof(struct pool_item_header), 0, 0,
-		    0, "phpool", NULL);
-		pool_setipl(&phpool, IPL_HIGH);
+		pool_init(&phpool, sizeof(struct pool_item_header), 0,
+		    IPL_HIGH, 0, "phpool", NULL);
 
 		/* make sure phpool wont "recurse" */
 		KASSERT(POOL_INPGHDR(&phpool));
@@ -348,14 +346,6 @@ pool_init(struct pool *pp, size_t size, u_int align, u_int ioff, int flags,
 	rw_exit_write(&pool_lock);
 }
 
-void
-pool_setipl(struct pool *pp, int ipl)
-{
-	pp->pr_ipl = ipl;
-	mtx_init(&pp->pr_mtx, ipl);
-	mtx_init(&pp->pr_requests_mtx, ipl);
-}
-
 /*
  * Decommission a pool resource.
  */
@@ -433,7 +423,6 @@ pool_get(struct pool *pp, int flags)
 
 	KASSERT(flags & (PR_WAITOK | PR_NOWAIT));
 
-
 	mtx_enter(&pp->pr_mtx);
 	if (pp->pr_nout >= pp->pr_hardlimit) {
 		if (ISSET(flags, PR_NOWAIT|PR_LIMITFAIL))
@@ -449,8 +438,8 @@ pool_get(struct pool *pp, int flags)
 
 	if (v == NULL) {
 		struct pool_get_memory mem = {
-		    MUTEX_INITIALIZER((pp->pr_ipl == -1) ?
-		    IPL_NONE : pp->pr_ipl), NULL };
+		    MUTEX_INITIALIZER(pp->pr_ipl),
+		    NULL };
 		struct pool_request pr;
 
 		pool_request_init(&pr, pool_get_done, &mem);
@@ -552,8 +541,7 @@ pool_do_get(struct pool *pp, int flags, int *slowdown)
 
 	MUTEX_ASSERT_LOCKED(&pp->pr_mtx);
 
-	if (pp->pr_ipl != -1)
-		splassert(pp->pr_ipl);
+	splassert(pp->pr_ipl);
 
 	/*
 	 * Account for this item now to avoid races if we need to give up
@@ -645,8 +633,7 @@ pool_put(struct pool *pp, void *v)
 
 	mtx_enter(&pp->pr_mtx);
 
-	if (pp->pr_ipl != -1)
-		splassert(pp->pr_ipl);
+	splassert(pp->pr_ipl);
 
 	ph = pr_find_pagehead(pp, v);
 
@@ -1327,8 +1314,7 @@ sysctl_dopool(int *name, u_int namelen, char *oldp, size_t *oldlenp)
 	case KERN_POOL_POOL:
 		memset(&pi, 0, sizeof(pi));
 
-		if (pp->pr_ipl != -1)
-			mtx_enter(&pp->pr_mtx);
+		mtx_enter(&pp->pr_mtx);
 		pi.pr_size = pp->pr_size;
 		pi.pr_pgsize = pp->pr_pgsize;
 		pi.pr_itemsperpage = pp->pr_itemsperpage;
@@ -1345,8 +1331,7 @@ sysctl_dopool(int *name, u_int namelen, char *oldp, size_t *oldlenp)
 		pi.pr_npagefree = pp->pr_npagefree;
 		pi.pr_hiwat = pp->pr_hiwat;
 		pi.pr_nidle = pp->pr_nidle;
-		if (pp->pr_ipl != -1)
-			mtx_leave(&pp->pr_mtx);
+		mtx_leave(&pp->pr_mtx);
 
 		rv = sysctl_rdstruct(oldp, oldlenp, NULL, &pi, sizeof(pi));
 		break;
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index f5c85adf495..78cce6e6cbe 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_pipe.c,v 1.73 2016/08/30 07:40:35 dlg Exp $	*/
+/*	$OpenBSD: sys_pipe.c,v 1.74 2016/09/15 02:00:16 dlg Exp $	*/
 
 /*
  * Copyright (c) 1996 John S. Dyson
@@ -870,8 +870,7 @@ filt_pipewrite(struct knote *kn, long hint)
 void
 pipe_init(void)
 {
-	pool_init(&pipe_pool, sizeof(struct pipe), 0, 0, PR_WAITOK, "pipepl",
-	    NULL);
-	pool_setipl(&pipe_pool, IPL_NONE);
+	pool_init(&pipe_pool, sizeof(struct pipe), 0, IPL_NONE, PR_WAITOK,
+	    "pipepl", NULL);
 }
 
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 08675685965..329afef73b7 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysv_msg.c,v 1.32 2016/08/30 07:40:35 dlg Exp $	*/
+/*	$OpenBSD: sysv_msg.c,v 1.33 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: sysv_msg.c,v 1.19 1996/02/09 19:00:18 christos Exp $	*/
 /*
  * Copyright (c) 2009 Bret S. Lambert <blambert@openbsd.org>
@@ -80,9 +80,8 @@ msginit(void)
 	msginfo.msgssz = MSGSSZ;
 	msginfo.msgseg = MSGSEG;
 
-	pool_init(&sysvmsgpl, sizeof(struct msg), 0, 0, PR_WAITOK, "sysvmsgpl",
-	    NULL);
-	pool_setipl(&sysvmsgpl, IPL_NONE);
+	pool_init(&sysvmsgpl, sizeof(struct msg), 0, IPL_NONE, PR_WAITOK,
+	    "sysvmsgpl", NULL);
 
 	TAILQ_INIT(&msg_queues);
 
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 151d53c9b2a..7b9684fffbe 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysv_shm.c,v 1.68 2016/08/30 07:40:35 dlg Exp $	*/
+/*	$OpenBSD: sysv_shm.c,v 1.69 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $	*/
 
 /*
@@ -523,9 +523,9 @@ void
 shminit(void)
 {
 
-	pool_init(&shm_pool, sizeof(struct shmid_ds) +
-	    sizeof(struct shm_handle), 0, 0, PR_WAITOK, "shmpl", NULL);
-	pool_setipl(&shm_pool, IPL_NONE);
+	pool_init(&shm_pool,
+	    sizeof(struct shmid_ds) + sizeof(struct shm_handle), 0,
+	    IPL_NONE, PR_WAITOK, "shmpl", NULL);
 	shmsegs = mallocarray(shminfo.shmmni, sizeof(struct shmid_ds *),
 	    M_SHM, M_WAITOK|M_ZERO);
 	shmseqs = mallocarray(shminfo.shmmni, sizeof(unsigned short),
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 59666e76648..d6b248f4713 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_mbuf.c,v 1.230 2016/09/15 00:52:08 dlg Exp $	*/
+/*	$OpenBSD: uipc_mbuf.c,v 1.231 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $	*/
 
 /*
@@ -150,21 +150,18 @@ mbinit(void)
 		panic("mbinit: the largest cluster size != MAXMCLBYTES");
 #endif
 
-	pool_init(&mbpool, MSIZE, 0, 0, 0, "mbufpl", NULL);
-	pool_setipl(&mbpool, IPL_NET);
+	pool_init(&mbpool, MSIZE, 0, IPL_NET, 0, "mbufpl", NULL);
 	pool_set_constraints(&mbpool, &kp_dma_contig);
 	pool_setlowat(&mbpool, mblowat);
 
-	pool_init(&mtagpool, PACKET_TAG_MAXSIZE + sizeof(struct m_tag),
-	    0, 0, 0, "mtagpl", NULL);
-	pool_setipl(&mtagpool, IPL_NET);
+	pool_init(&mtagpool, PACKET_TAG_MAXSIZE + sizeof(struct m_tag), 0,
+	    IPL_NET, 0, "mtagpl", NULL);
 
 	for (i = 0; i < nitems(mclsizes); i++) {
 		snprintf(mclnames[i], sizeof(mclnames[0]), "mcl%dk",
 		    mclsizes[i] >> 10);
-		pool_init(&mclpools[i], mclsizes[i], 0, 0, 0,
+		pool_init(&mclpools[i], mclsizes[i], 0, IPL_NET, 0,
 		    mclnames[i], NULL);
-		pool_setipl(&mclpools[i], IPL_NET);
 		pool_set_constraints(&mclpools[i], &kp_dma_contig);
 		pool_setlowat(&mclpools[i], mcllowat);
 	}
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 9f89572a872..65592765546 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket.c,v 1.158 2016/09/13 07:50:36 mpi Exp $	*/
+/*	$OpenBSD: uipc_socket.c,v 1.159 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $	*/
 
 /*
@@ -92,12 +92,11 @@ struct taskq *sosplice_taskq;
 void
 soinit(void)
 {
-	pool_init(&socket_pool, sizeof(struct socket), 0, 0, 0, "sockpl", NULL);
-	pool_setipl(&socket_pool, IPL_SOFTNET);
+	pool_init(&socket_pool, sizeof(struct socket), 0, IPL_SOFTNET, 0,
+	    "sockpl", NULL);
 #ifdef SOCKET_SPLICE
-	pool_init(&sosplice_pool, sizeof(struct sosplice), 0, 0, 0, "sosppl",
-	    NULL);
-	pool_setipl(&sosplice_pool, IPL_SOFTNET);
+	pool_init(&sosplice_pool, sizeof(struct sosplice), 0, IPL_SOFTNET, 0,
+	    "sosppl", NULL);
 #endif
 }
 
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 8c72f68eaea..7e311877cc1 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_bio.c,v 1.176 2016/09/04 10:51:24 naddy Exp $	*/
+/*	$OpenBSD: vfs_bio.c,v 1.177 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $	*/
 
 /*
@@ -193,8 +193,7 @@ bufinit(void)
 	 */
 	bufkvm &= ~(MAXPHYS - 1);
 
-	pool_init(&bufpool, sizeof(struct buf), 0, 0, 0, "bufpl", NULL);
-	pool_setipl(&bufpool, IPL_BIO);
+	pool_init(&bufpool, sizeof(struct buf), 0, IPL_BIO, 0, "bufpl", NULL);
 
 	bufcache_init();
 
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index a1f5a5050e3..aebba744f38 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_cache.c,v 1.50 2016/08/25 00:01:13 dlg Exp $	*/
+/*	$OpenBSD: vfs_cache.c,v 1.51 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: vfs_cache.c,v 1.13 1996/02/04 02:18:09 christos Exp $	*/
 
 /*
@@ -417,9 +417,8 @@ nchinit(void)
 {
 	TAILQ_INIT(&nclruhead);
 	TAILQ_INIT(&nclruneghead);
-	pool_init(&nch_pool, sizeof(struct namecache), 0, 0, PR_WAITOK,
+	pool_init(&nch_pool, sizeof(struct namecache), 0, IPL_NONE, PR_WAITOK,
 	    "nchpl", NULL);
-	pool_setipl(&nch_pool, IPL_NONE);
 }
 
 /*
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 91853a64e16..25f7a6cccf4 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_init.c,v 1.37 2016/08/25 00:01:13 dlg Exp $	*/
+/*	$OpenBSD: vfs_init.c,v 1.38 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: vfs_init.c,v 1.6 1996/02/09 19:00:58 christos Exp $	*/
 
 /*
@@ -148,8 +148,8 @@ vfsinit(void)
 	struct vfsconf *vfsconflist;
 	int vfsconflistlen;
 
-	pool_init(&namei_pool, MAXPATHLEN, 0, 0, PR_WAITOK, "namei", NULL);
-	pool_setipl(&namei_pool, IPL_NONE);
+	pool_init(&namei_pool, MAXPATHLEN, 0, IPL_NONE, PR_WAITOK, "namei",
+	    NULL);
 
 	/* Initialize the vnode table. */
 	vntblinit();
diff --git a/sys/kern/vfs_lockf.c b/sys/kern/vfs_lockf.c
index 1ebb6755f5a..6ced82196a4 100644
--- a/sys/kern/vfs_lockf.c
+++ b/sys/kern/vfs_lockf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_lockf.c,v 1.22 2016/08/25 00:01:13 dlg Exp $	*/
+/*	$OpenBSD: vfs_lockf.c,v 1.23 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: vfs_lockf.c,v 1.7 1996/02/04 02:18:21 christos Exp $	*/
 
 /*
@@ -75,9 +75,8 @@ int	lockf_debug = DEBUG_SETLOCK|DEBUG_CLEARLOCK|DEBUG_WAKELOCK;
 void
 lf_init(void)
 {
-	pool_init(&lockfpool, sizeof(struct lockf), 0, 0, PR_WAITOK,
+	pool_init(&lockfpool, sizeof(struct lockf), 0, IPL_NONE, PR_WAITOK,
 	    "lockfpl", NULL);
-	pool_setipl(&lockfpool, IPL_NONE);
 }
 
 struct lockf *lf_alloc(uid_t, int);
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 57342527d6d..2bdb9abed61 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.250 2016/08/25 00:01:13 dlg Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.251 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -143,12 +143,10 @@ vntblinit(void)
 {
 	/* buffer cache may need a vnode for each buffer */
 	maxvnodes = 2 * initialvnodes;
-	pool_init(&vnode_pool, sizeof(struct vnode), 0, 0, PR_WAITOK,
-	    "vnodes", NULL);
-	pool_setipl(&vnode_pool, IPL_NONE);
-	pool_init(&uvm_vnode_pool, sizeof(struct uvm_vnode), 0, 0, PR_WAITOK,
-	    "uvmvnodes", NULL);
-	pool_setipl(&uvm_vnode_pool, IPL_NONE);
+	pool_init(&vnode_pool, sizeof(struct vnode), 0, IPL_NONE,
+	    PR_WAITOK, "vnodes", NULL);
+	pool_init(&uvm_vnode_pool, sizeof(struct uvm_vnode), 0, IPL_NONE,
+	    PR_WAITOK, "uvmvnodes", NULL);
 	TAILQ_INIT(&vnode_hold_list);
 	TAILQ_INIT(&vnode_free_list);
 	TAILQ_INIT(&mountlist);
diff --git a/sys/net/art.c b/sys/net/art.c
index 00699ab9469..f1bfe5edbf7 100644
--- a/sys/net/art.c
+++ b/sys/net/art.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: art.c,v 1.23 2016/08/30 07:42:57 jmatthew Exp $ */
+/*	$OpenBSD: art.c,v 1.24 2016/09/15 02:00:18 dlg Exp $ */
 
 /*
  * Copyright (c) 2015 Martin Pieuchot
@@ -102,19 +102,14 @@ struct task		 art_node_gc_task = TASK_INITIALIZER(art_gc, NULL);
 void
 art_init(void)
 {
-	pool_init(&an_pool, sizeof(struct art_node), 0, 0, 0, "art_node", NULL);
-	pool_setipl(&an_pool, IPL_SOFTNET);
-
-	pool_init(&at_pool, sizeof(struct art_table), 0, 0, 0, "art_table",
-	    NULL);
-	pool_setipl(&at_pool, IPL_SOFTNET);
-
-	pool_init(&at_heap_4_pool, AT_HEAPSIZE(4), 0, 0, 0, "art_heap4", NULL);
-	pool_setipl(&at_heap_4_pool, IPL_SOFTNET);
-
-	pool_init(&at_heap_8_pool, AT_HEAPSIZE(8), 0, 0, 0, "art_heap8",
-	    &pool_allocator_single);
-	pool_setipl(&at_heap_8_pool, IPL_SOFTNET);
+	pool_init(&an_pool, sizeof(struct art_node), 0, IPL_SOFTNET, 0,
+	    "art_node", NULL);
+	pool_init(&at_pool, sizeof(struct art_table), 0, IPL_SOFTNET, 0,
+	    "art_table", NULL);
+	pool_init(&at_heap_4_pool, AT_HEAPSIZE(4), 0, IPL_SOFTNET, 0,
+	    "art_heap4", NULL);
+	pool_init(&at_heap_8_pool, AT_HEAPSIZE(8), 0, IPL_SOFTNET, 0,
+	    "art_heap8", &pool_allocator_single);
 }
 
 /*
diff --git a/sys/net/hfsc.c b/sys/net/hfsc.c
index 969138b33b5..d63a7bee03b 100644
--- a/sys/net/hfsc.c
+++ b/sys/net/hfsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hfsc.c,v 1.32 2015/11/21 01:08:49 dlg Exp $	*/
+/*	$OpenBSD: hfsc.c,v 1.33 2016/09/15 02:00:18 dlg Exp $	*/
 
 /*
  * Copyright (c) 2012-2013 Henning Brauer <henning@openbsd.org>
@@ -315,12 +315,10 @@ hfsc_grow_class_tbl(struct hfsc_if *hif, u_int howmany)
 void
 hfsc_initialize(void)
 {
-	pool_init(&hfsc_class_pl, sizeof(struct hfsc_class), 0, 0, PR_WAITOK,
-	    "hfscclass", NULL);
-	pool_setipl(&hfsc_class_pl, IPL_NONE);
-	pool_init(&hfsc_internal_sc_pl, sizeof(struct hfsc_internal_sc), 0, 0,
-	    PR_WAITOK, "hfscintsc", NULL);
-	pool_setipl(&hfsc_internal_sc_pl, IPL_NONE);
+	pool_init(&hfsc_class_pl, sizeof(struct hfsc_class), 0,
+	    IPL_NONE, PR_WAITOK, "hfscclass", NULL);
+	pool_init(&hfsc_internal_sc_pl, sizeof(struct hfsc_internal_sc), 0,
+	    IPL_NONE, PR_WAITOK, "hfscintsc", NULL);
 }
 
 struct hfsc_if *
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index e926fede27f..acca3fae946 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pfsync.c,v 1.230 2016/08/23 12:37:44 dlg Exp $	*/
+/*	$OpenBSD: if_pfsync.c,v 1.231 2016/09/15 02:00:18 dlg Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff
@@ -302,8 +302,8 @@ pfsync_clone_create(struct if_clone *ifc, int unit)
 	for (q = 0; q < PFSYNC_S_COUNT; q++)
 		TAILQ_INIT(&sc->sc_qs[q]);
 
-	pool_init(&sc->sc_pool, PFSYNC_PLSIZE, 0, 0, 0, "pfsync", NULL);
-	pool_setipl(&sc->sc_pool, IPL_SOFTNET);
+	pool_init(&sc->sc_pool, PFSYNC_PLSIZE, 0, IPL_SOFTNET, 0, "pfsync",
+	    NULL);
 	TAILQ_INIT(&sc->sc_upd_req_list);
 	TAILQ_INIT(&sc->sc_deferrals);
 	sc->sc_deferred = 0;
diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index 8d98fda5797..fbadf0cd9ab 100644
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pppx.c,v 1.55 2016/09/15 01:37:34 dlg Exp $ */
+/*	$OpenBSD: if_pppx.c,v 1.56 2016/09/15 02:00:18 dlg Exp $ */
 
 /*
  * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -252,9 +252,8 @@ pppxopen(dev_t dev, int flags, int mode, struct proc *p)
 
 	if (LIST_EMPTY(&pppx_devs) && pppx_if_pl == NULL) {
 		pppx_if_pl = malloc(sizeof(*pppx_if_pl), M_DEVBUF, M_WAITOK);
-		pool_init(pppx_if_pl, sizeof(struct pppx_if), 0, 0, PR_WAITOK,
-		    "pppxif", NULL);
-		pool_setipl(pppx_if_pl, IPL_NONE);
+		pool_init(pppx_if_pl, sizeof(struct pppx_if), 0, IPL_NONE,
+		    PR_WAITOK, "pppxif", NULL);
 	}
 
 	pxd = malloc(sizeof(*pxd), M_DEVBUF, M_WAITOK | M_ZERO);
diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c
index 53fd9662faf..75c73bc3843 100644
--- a/sys/net/pf_if.c
+++ b/sys/net/pf_if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_if.c,v 1.83 2016/09/02 10:19:49 dlg Exp $ */
+/*	$OpenBSD: pf_if.c,v 1.84 2016/09/15 02:00:18 dlg Exp $ */
 
 /*
  * Copyright 2005 Henning Brauer <henning@openbsd.org>
@@ -88,9 +88,8 @@ pfi_initialize(void)
 	if (pfi_all != NULL)	/* already initialized */
 		return;
 
-	pool_init(&pfi_addr_pl, sizeof(struct pfi_dynaddr), 0, 0, 0,
+	pool_init(&pfi_addr_pl, sizeof(struct pfi_dynaddr), 0, IPL_SOFTNET, 0,
 	    "pfiaddrpl", NULL);
-	pool_setipl(&pfi_addr_pl, IPL_SOFTNET);
 	pfi_buffer_max = 64;
 	pfi_buffer = mallocarray(pfi_buffer_max, sizeof(*pfi_buffer),
 	    PFI_MTYPE, M_WAITOK);
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 7b360b0db05..e8b364e7283 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_ioctl.c,v 1.299 2016/09/03 17:11:40 sashan Exp $ */
+/*	$OpenBSD: pf_ioctl.c,v 1.300 2016/09/15 02:00:18 dlg Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -141,30 +141,22 @@ pfattach(int num)
 {
 	u_int32_t *timeout = pf_default_rule.timeout;
 
-	pool_init(&pf_rule_pl, sizeof(struct pf_rule), 0, 0, 0, "pfrule",
-	    NULL);
-	pool_setipl(&pf_rule_pl, IPL_SOFTNET);
-	pool_init(&pf_src_tree_pl, sizeof(struct pf_src_node), 0, 0, 0,
-	    "pfsrctr", NULL);
-	pool_setipl(&pf_src_tree_pl, IPL_SOFTNET);
-	pool_init(&pf_sn_item_pl, sizeof(struct pf_sn_item), 0, 0, 0,
-	    "pfsnitem", NULL);
-	pool_setipl(&pf_sn_item_pl, IPL_SOFTNET);
-	pool_init(&pf_state_pl, sizeof(struct pf_state), 0, 0, 0, "pfstate",
-	    NULL);
-	pool_setipl(&pf_state_pl, IPL_SOFTNET);
-	pool_init(&pf_state_key_pl, sizeof(struct pf_state_key), 0, 0, 0,
-	    "pfstkey", NULL);
-	pool_setipl(&pf_state_key_pl, IPL_SOFTNET);
-	pool_init(&pf_state_item_pl, sizeof(struct pf_state_item), 0, 0, 0,
-	    "pfstitem", NULL);
-	pool_setipl(&pf_state_item_pl, IPL_SOFTNET);
-	pool_init(&pf_rule_item_pl, sizeof(struct pf_rule_item), 0, 0, 0,
-	    "pfruleitem", NULL);
-	pool_setipl(&pf_rule_item_pl, IPL_SOFTNET);
-	pool_init(&pf_queue_pl, sizeof(struct pf_queuespec), 0, 0, 0, 
-	    "pfqueue", NULL);
-	pool_setipl(&pf_queue_pl, IPL_SOFTNET);
+	pool_init(&pf_rule_pl, sizeof(struct pf_rule), 0,
+	    IPL_SOFTNET, 0, "pfrule", NULL);
+	pool_init(&pf_src_tree_pl, sizeof(struct pf_src_node), 0,
+	    IPL_SOFTNET, 0, "pfsrctr", NULL);
+	pool_init(&pf_sn_item_pl, sizeof(struct pf_sn_item), 0,
+	    IPL_SOFTNET, 0, "pfsnitem", NULL);
+	pool_init(&pf_state_pl, sizeof(struct pf_state), 0,
+	    IPL_SOFTNET, 0, "pfstate", NULL);
+	pool_init(&pf_state_key_pl, sizeof(struct pf_state_key), 0,
+	    IPL_SOFTNET, 0, "pfstkey", NULL);
+	pool_init(&pf_state_item_pl, sizeof(struct pf_state_item), 0,
+	    IPL_SOFTNET, 0, "pfstitem", NULL);
+	pool_init(&pf_rule_item_pl, sizeof(struct pf_rule_item), 0,
+	    IPL_SOFTNET, 0, "pfruleitem", NULL);
+	pool_init(&pf_queue_pl, sizeof(struct pf_queuespec), 0,
+	    IPL_SOFTNET, 0, "pfqueue", NULL);
 	hfsc_initialize();
 	pfr_initialize();
 	pfi_initialize();
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index 2410f428a7f..5c5d6ff0e9a 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_norm.c,v 1.191 2016/09/02 10:19:49 dlg Exp $ */
+/*	$OpenBSD: pf_norm.c,v 1.192 2016/09/15 02:00:18 dlg Exp $ */
 
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -137,15 +137,12 @@ int			 pf_nfrents;
 void
 pf_normalize_init(void)
 {
-	pool_init(&pf_frent_pl, sizeof(struct pf_frent), 0, 0, 0, "pffrent",
-	    NULL);
-	pool_setipl(&pf_frent_pl, IPL_SOFTNET);
-	pool_init(&pf_frag_pl, sizeof(struct pf_fragment), 0, 0, 0, "pffrag",
-	    NULL);
-	pool_setipl(&pf_frag_pl, IPL_SOFTNET);
-	pool_init(&pf_state_scrub_pl, sizeof(struct pf_state_scrub), 0, 0, 0,
-	    "pfstscr", NULL);
-	pool_setipl(&pf_state_scrub_pl, IPL_SOFTNET);
+	pool_init(&pf_frent_pl, sizeof(struct pf_frent), 0,
+	    IPL_SOFTNET, 0, "pffrent", NULL);
+	pool_init(&pf_frag_pl, sizeof(struct pf_fragment), 0,
+	    IPL_SOFTNET, 0, "pffrag", NULL);
+	pool_init(&pf_state_scrub_pl, sizeof(struct pf_state_scrub), 0,
+	    IPL_SOFTNET, 0, "pfstscr", NULL);
 
 	pool_sethiwat(&pf_frag_pl, PFFRAG_FRAG_HIWAT);
 	pool_sethardlimit(&pf_frent_pl, PFFRAG_FRENT_HIWAT, NULL, 0);
diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c
index 14b3291360c..5e571444d71 100644
--- a/sys/net/pf_osfp.c
+++ b/sys/net/pf_osfp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_osfp.c,v 1.36 2016/09/02 11:43:53 dlg Exp $ */
+/*	$OpenBSD: pf_osfp.c,v 1.37 2016/09/15 02:00:18 dlg Exp $ */
 
 /*
  * Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
@@ -53,7 +53,6 @@ typedef struct pool pool_t;
 #define pool_get(pool, flags)	malloc(*(pool))
 #define pool_put(pool, item)	free(item)
 #define pool_init(pool, size, a, ao, f, m, p)	(*(pool)) = (size)
-#define pool_setipl(pool, ipl)	((void)0)
 
 #ifdef PFDEBUG
 #include <sys/stdarg.h>	/* for DPFPRINTF() */
@@ -288,12 +287,10 @@ pf_osfp_match(struct pf_osfp_enlist *list, pf_osfp_t os)
 void
 pf_osfp_initialize(void)
 {
-	pool_init(&pf_osfp_entry_pl, sizeof(struct pf_osfp_entry), 0, 0,
-	    PR_WAITOK, "pfosfpen", NULL);
-	pool_setipl(&pf_osfp_entry_pl, IPL_NONE);
-	pool_init(&pf_osfp_pl, sizeof(struct pf_os_fingerprint), 0, 0,
-	    PR_WAITOK, "pfosfp", NULL);
-	pool_setipl(&pf_osfp_pl, IPL_NONE);
+	pool_init(&pf_osfp_entry_pl, sizeof(struct pf_osfp_entry), 0,
+	    IPL_NONE, PR_WAITOK, "pfosfpen", NULL);
+	pool_init(&pf_osfp_pl, sizeof(struct pf_os_fingerprint), 0,
+	    IPL_NONE, PR_WAITOK, "pfosfp", NULL);
 	SLIST_INIT(&pf_osfp_list);
 }
 
diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c
index e6bca20c371..5aa261c42cd 100644
--- a/sys/net/pf_table.c
+++ b/sys/net/pf_table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_table.c,v 1.117 2016/09/02 10:19:49 dlg Exp $	*/
+/*	$OpenBSD: pf_table.c,v 1.118 2016/09/15 02:00:18 dlg Exp $	*/
 
 /*
  * Copyright (c) 2002 Cedric Berger
@@ -215,22 +215,16 @@ pfr_initialize(void)
 {
 	rn_init(sizeof(struct sockaddr_in6));
 
-	pool_init(&pfr_ktable_pl, sizeof(struct pfr_ktable), 0, 0, 0,
-	    "pfrktable", NULL);
-	pool_setipl(&pfr_ktable_pl, IPL_SOFTNET);
+	pool_init(&pfr_ktable_pl, sizeof(struct pfr_ktable),
+	    0, IPL_SOFTNET, 0, "pfrktable", NULL);
 	pool_init(&pfr_kentry_pl[PFRKE_PLAIN], sizeof(struct pfr_kentry),
-	    0, 0, 0, "pfrke_plain", NULL);
-	pool_setipl(&pfr_kentry_pl[PFRKE_PLAIN], IPL_SOFTNET);
+	    0, IPL_SOFTNET, 0, "pfrke_plain", NULL);
 	pool_init(&pfr_kentry_pl[PFRKE_ROUTE], sizeof(struct pfr_kentry_route),
-	    0, 0, 0, "pfrke_route", NULL);
-	pool_setipl(&pfr_kentry_pl[PFRKE_ROUTE], IPL_SOFTNET);
+	    0, IPL_SOFTNET, 0, "pfrke_route", NULL);
 	pool_init(&pfr_kentry_pl[PFRKE_COST], sizeof(struct pfr_kentry_cost),
-	    0, 0, 0, "pfrke_cost", NULL);
-	pool_setipl(&pfr_kentry_pl[PFRKE_COST], IPL_SOFTNET);
-
+	    0, IPL_SOFTNET, 0, "pfrke_cost", NULL);
 	pool_init(&pfr_kcounters_pl, sizeof(struct pfr_kcounters),
-	    0, 0, 0, "pfrkcounters", NULL);
-	pool_setipl(&pfr_kcounters_pl, IPL_SOFTNET);
+	    0, IPL_SOFTNET, 0, "pfrkcounters", NULL);
 
 	pfr_sin.sin_len = sizeof(pfr_sin);
 	pfr_sin.sin_family = AF_INET;
diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c
index dcf70c22997..e264b668a18 100644
--- a/sys/net/pfkeyv2.c
+++ b/sys/net/pfkeyv2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.c,v 1.147 2016/08/30 23:30:37 dlg Exp $ */
+/* $OpenBSD: pfkeyv2.c,v 1.148 2016/09/15 02:00:18 dlg Exp $ */
 
 /*
  *	@(#)COPYRIGHT	1.1 (NRL) 17 January 1995
@@ -1517,9 +1517,8 @@ pfkeyv2_send(struct socket *socket, void *message, int len)
 			if (ipsec_policy_pool_initialized == 0) {
 				ipsec_policy_pool_initialized = 1;
 				pool_init(&ipsec_policy_pool,
-				    sizeof(struct ipsec_policy), 0, 0, 0,
-				    "ipsec policy", NULL);
-				pool_setipl(&ipsec_policy_pool, IPL_NONE);
+				    sizeof(struct ipsec_policy), 0,
+				    IPL_NONE, 0, "ipsec policy", NULL);
 			}
 
 			/* Allocate policy entry */
diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index 53cc38d983a..ad9701f5d74 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex.c,v 1.88 2016/08/30 23:29:04 dlg Exp $	*/
+/*	$OpenBSD: pipex.c,v 1.89 2016/09/15 02:00:18 dlg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -131,12 +131,10 @@ pipex_init(void)
 
 	rn_init(sizeof(struct sockaddr_in6));
 
-	pool_init(&pipex_session_pool, sizeof(struct pipex_session), 0, 0,
-	    PR_WAITOK, "ppxss", NULL);
-	pool_setipl(&pipex_session_pool, IPL_NONE);
-	pool_init(&mppe_key_pool, PIPEX_MPPE_KEYLEN * PIPEX_MPPE_NOLDKEY, 0, 0,
-	    PR_WAITOK, "mppekey", NULL);
-	pool_setipl(&mppe_key_pool, IPL_NONE);
+	pool_init(&pipex_session_pool, sizeof(struct pipex_session), 0,
+	    IPL_NONE, PR_WAITOK, "ppxss", NULL);
+	pool_init(&mppe_key_pool, PIPEX_MPPE_KEYLEN * PIPEX_MPPE_NOLDKEY, 0,
+	    IPL_NONE, PR_WAITOK, "mppekey", NULL);
 
 	LIST_INIT(&pipex_session_list);
 	LIST_INIT(&pipex_close_wait_list);
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 11c41ccb402..862db5cbb07 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp_tty.c,v 1.43 2016/01/25 18:47:00 stefan Exp $	*/
+/*	$OpenBSD: ppp_tty.c,v 1.44 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $	*/
 
 /*
@@ -173,8 +173,8 @@ pppopen(dev_t dev, struct tty *tp, struct proc *p)
     if (ppp_pkts.pr_size == 0) {
 	extern struct kmem_pa_mode kp_dma_contig;
 
-	pool_init(&ppp_pkts, sizeof(struct ppp_pkt), 0, 0, 0, "ppppkts", NULL);
-	pool_setipl(&ppp_pkts, IPL_TTY); /* IPL_SOFTTTY */
+	pool_init(&ppp_pkts, sizeof(struct ppp_pkt), 0,
+	  IPL_TTY, 0, "ppppkts", NULL); /* IPL_SOFTTTY */
 	pool_set_constraints(&ppp_pkts, &kp_dma_contig);
     }
     rw_exit_write(&ppp_pkt_init);
diff --git a/sys/net/radix.c b/sys/net/radix.c
index bc650f02082..bc76d59fb3c 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radix.c,v 1.53 2016/08/30 23:29:39 dlg Exp $	*/
+/*	$OpenBSD: radix.c,v 1.54 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: radix.c,v 1.20 2003/08/07 16:32:56 agc Exp $	*/
 
 /*
@@ -1223,9 +1223,8 @@ rn_init(unsigned int keylen)
 	char *cp, *cplim;
 
 	if (max_keylen == 0) {
-		pool_init(&rtmask_pool, sizeof(struct radix_mask), 0, 0, 0,
-		    "rtmask", NULL);
-		pool_setipl(&rtmask_pool, IPL_SOFTNET);
+		pool_init(&rtmask_pool, sizeof(struct radix_mask), 0,
+		    IPL_SOFTNET, 0, "rtmask", NULL);
 	}
 
 	if (keylen <= max_keylen)
diff --git a/sys/net/route.c b/sys/net/route.c
index 1e0696ba950..d15074e92cb 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.328 2016/09/13 08:11:39 mpi Exp $	*/
+/*	$OpenBSD: route.c,v 1.329 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -191,9 +191,8 @@ TAILQ_HEAD(rt_labels, rt_label)	rt_labels = TAILQ_HEAD_INITIALIZER(rt_labels);
 void
 route_init(void)
 {
-	pool_init(&rtentry_pool, sizeof(struct rtentry), 0, 0, 0, "rtentry",
-	    NULL);
-	pool_setipl(&rtentry_pool, IPL_SOFTNET);
+	pool_init(&rtentry_pool, sizeof(struct rtentry), 0, IPL_SOFTNET, 0,
+	    "rtentry", NULL);
 
 	while (rt_hashjitter == 0)
 		rt_hashjitter = arc4random();
@@ -1462,9 +1461,8 @@ rt_timer_init(void)
 	if (rt_init_done)
 		panic("rt_timer_init: already initialized");
 
-	pool_init(&rttimer_pool, sizeof(struct rttimer), 0, 0, 0, "rttmr",
-	    NULL);
-	pool_setipl(&rttimer_pool, IPL_SOFTNET);
+	pool_init(&rttimer_pool, sizeof(struct rttimer), 0, IPL_SOFTNET, 0,
+	    "rttmr", NULL);
 
 	LIST_INIT(&rttimer_queue_head);
 	timeout_set(&rt_timer_timeout, rt_timer_timer, &rt_timer_timeout);
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index b3aa716290b..da076c229dc 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.c,v 1.223 2016/09/07 09:36:49 mpi Exp $	*/
+/*	$OpenBSD: if_ether.c,v 1.224 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $	*/
 
 /*
@@ -135,9 +135,8 @@ arp_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt)
 		static struct timeout arptimer_to;
 
 		arpinit_done = 1;
-		pool_init(&arp_pool, sizeof(struct llinfo_arp), 0, 0, 0, "arp",
-		    NULL);
-		pool_setipl(&arp_pool, IPL_SOFTNET);
+		pool_init(&arp_pool, sizeof(struct llinfo_arp), 0,
+		    IPL_SOFTNET, 0, "arp", NULL);
 
 		timeout_set(&arptimer_to, arptimer, &arptimer_to);
 		timeout_add_sec(&arptimer_to, 1);
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index a553f443aca..18b5c2e84eb 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.c,v 1.214 2016/09/06 00:04:15 dlg Exp $	*/
+/*	$OpenBSD: in_pcb.c,v 1.215 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $	*/
 
 /*
@@ -255,9 +255,8 @@ in_pcballoc(struct socket *so, struct inpcbtable *table)
 	splsoftassert(IPL_SOFTNET);
 
 	if (inpcb_pool_initialized == 0) {
-		pool_init(&inpcb_pool, sizeof(struct inpcb), 0, 0, 0,
-		    "inpcbpl", NULL);
-		pool_setipl(&inpcb_pool, IPL_SOFTNET);
+		pool_init(&inpcb_pool, sizeof(struct inpcb), 0,
+		    IPL_SOFTNET, 0, "inpcbpl", NULL);
 		inpcb_pool_initialized = 1;
 	}
 	inp = pool_get(&inpcb_pool, PR_NOWAIT|PR_ZERO);
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 1b454ff3ff5..48fd1ee10f4 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.280 2016/09/06 00:04:15 dlg Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.281 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -166,10 +166,10 @@ ip_init(void)
 	const u_int16_t defrootonlyports_tcp[] = DEFROOTONLYPORTS_TCP;
 	const u_int16_t defrootonlyports_udp[] = DEFROOTONLYPORTS_UDP;
 
-	pool_init(&ipqent_pool, sizeof(struct ipqent), 0, 0, 0, "ipqe",  NULL);
-	pool_setipl(&ipqent_pool, IPL_SOFTNET);
-	pool_init(&ipq_pool, sizeof(struct ipq), 0, 0, 0, "ipq", NULL);
-	pool_setipl(&ipq_pool, IPL_SOFTNET);
+	pool_init(&ipqent_pool, sizeof(struct ipqent), 0,
+	    IPL_SOFTNET, 0, "ipqe",  NULL);
+	pool_init(&ipq_pool, sizeof(struct ipq), 0,
+	    IPL_SOFTNET, 0, "ipq", NULL);
 
 	pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
 	if (pr == NULL)
diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c
index 33ff65c109b..a2e796f6b3d 100644
--- a/sys/netinet/ip_spd.c
+++ b/sys/netinet/ip_spd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_spd.c,v 1.89 2016/09/06 00:04:15 dlg Exp $ */
+/* $OpenBSD: ip_spd.c,v 1.90 2016/09/15 02:00:18 dlg Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -669,8 +669,7 @@ ipsp_acquire_sa(struct ipsec_policy *ipo, union sockaddr_union *gw,
 	if (ipsec_acquire_pool_initialized == 0) {
 		ipsec_acquire_pool_initialized = 1;
 		pool_init(&ipsec_acquire_pool, sizeof(struct ipsec_acquire),
-		    0, 0, 0, "ipsec acquire", NULL);
-		pool_setipl(&ipsec_acquire_pool, IPL_SOFTNET);
+		    0, IPL_SOFTNET, 0, "ipsec acquire", NULL);
 	}
 
 	ipa = pool_get(&ipsec_acquire_pool, PR_NOWAIT|PR_ZERO);
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 5a6013c05ef..ddd71064f85 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_input.c,v 1.326 2016/08/31 11:05:05 mpi Exp $	*/
+/*	$OpenBSD: tcp_input.c,v 1.327 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $	*/
 
 /*
@@ -3372,9 +3372,8 @@ syn_cache_init(void)
 	}
 
 	/* Initialize the syn cache pool. */
-	pool_init(&syn_cache_pool, sizeof(struct syn_cache), 0, 0, 0,
-	    "syncache", NULL);
-	pool_setipl(&syn_cache_pool, IPL_SOFTNET);
+	pool_init(&syn_cache_pool, sizeof(struct syn_cache), 0, IPL_SOFTNET,
+	    0, "syncache", NULL);
 }
 
 void
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 50936a0f8fa..bd0692d5f24 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_subr.c,v 1.154 2016/09/06 00:04:15 dlg Exp $	*/
+/*	$OpenBSD: tcp_subr.c,v 1.155 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $	*/
 
 /*
@@ -141,15 +141,14 @@ void
 tcp_init(void)
 {
 	tcp_iss = 1;		/* wrong */
-	pool_init(&tcpcb_pool, sizeof(struct tcpcb), 0, 0, 0, "tcpcb", NULL);
-	pool_setipl(&tcpcb_pool, IPL_SOFTNET);
-	pool_init(&tcpqe_pool, sizeof(struct tcpqent), 0, 0, 0, "tcpqe", NULL);
-	pool_setipl(&tcpcb_pool, IPL_SOFTNET);
+	pool_init(&tcpcb_pool, sizeof(struct tcpcb), 0, IPL_SOFTNET, 0,
+	    "tcpcb", NULL);
+	pool_init(&tcpqe_pool, sizeof(struct tcpqent), 0, IPL_SOFTNET, 0,
+	    "tcpqe", NULL);
 	pool_sethardlimit(&tcpqe_pool, tcp_reass_limit, NULL, 0);
 #ifdef TCP_SACK
-	pool_init(&sackhl_pool, sizeof(struct sackhole), 0, 0, 0, "sackhl",
-	    NULL);
-	pool_setipl(&sackhl_pool, IPL_SOFTNET);
+	pool_init(&sackhl_pool, sizeof(struct sackhole), 0, IPL_SOFTNET, 0,
+	    "sackhl", NULL);
 	pool_sethardlimit(&sackhl_pool, tcp_sackhole_limit, NULL, 0);
 #endif /* TCP_SACK */
 	in_pcbinit(&tcbtable, TCB_INITIAL_HASH_SIZE);
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 216a0fb359c..5d95d9018b1 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.191 2016/09/06 00:04:15 dlg Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.192 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -116,8 +116,8 @@ nd6_init(void)
 	}
 
 	TAILQ_INIT(&nd6_list);
-	pool_init(&nd6_pool, sizeof(struct llinfo_nd6), 0, 0, 0, "nd6", NULL);
-	pool_setipl(&nd6_pool, IPL_SOFTNET);
+	pool_init(&nd6_pool, sizeof(struct llinfo_nd6), 0,
+	    IPL_SOFTNET, 0, "nd6", NULL);
 
 	/* initialization of the default router list */
 	TAILQ_INIT(&nd_defrouter);
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index bfd5e88fcec..6b4c4fc778c 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_subs.c,v 1.132 2016/08/30 07:12:49 dlg Exp $	*/
+/*	$OpenBSD: nfs_subs.c,v 1.133 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $	*/
 
 /*
@@ -897,9 +897,8 @@ nfs_init(void)
 	nfsrv_initcache();		/* Init the server request cache */
 #endif /* NFSSERVER */
 
-	pool_init(&nfsreqpl, sizeof(struct nfsreq), 0, 0, PR_WAITOK,
+	pool_init(&nfsreqpl, sizeof(struct nfsreq), 0, IPL_NONE, PR_WAITOK,
 	    "nfsreqpl", NULL);
-	pool_setipl(&nfsreqpl, IPL_NONE);
 }
 
 #ifdef NFSCLIENT
@@ -910,9 +909,8 @@ nfs_vfs_init(struct vfsconf *vfsp)
 
 	TAILQ_INIT(&nfs_bufq);
 
-	pool_init(&nfs_node_pool, sizeof(struct nfsnode), 0, 0, PR_WAITOK,
-	    "nfsnodepl", NULL);
-	pool_setipl(&nfs_node_pool, IPL_NONE);
+	pool_init(&nfs_node_pool, sizeof(struct nfsnode), 0, IPL_NONE,
+		  PR_WAITOK, "nfsnodepl", NULL);
 
 	return (0);
 }
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 2c3473298d0..72e300562a2 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_syscalls.c,v 1.105 2016/08/30 07:12:49 dlg Exp $	*/
+/*	$OpenBSD: nfs_syscalls.c,v 1.106 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $	*/
 
 /*
@@ -547,8 +547,7 @@ nfsrv_init(int terminating)
 
 	if (!terminating) {
 		pool_init(&nfsrv_descript_pl, sizeof(struct nfsrv_descript),
-		    0, 0, PR_WAITOK, "ndscpl", NULL);
-		pool_setipl(&nfsrv_descript_pl, IPL_NONE);
+		    0, IPL_NONE, PR_WAITOK, "ndscpl", NULL);
 	}
 }
 #endif /* NFSSERVER */
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index d5356f23a78..4396042bca9 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_base.c,v 1.224 2016/03/12 15:16:04 krw Exp $	*/
+/*	$OpenBSD: scsi_base.c,v 1.225 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $	*/
 
 /*
@@ -126,13 +126,10 @@ scsi_init(void)
 #endif
 
 	/* Initialize the scsi_xfer pool. */
-	pool_init(&scsi_xfer_pool, sizeof(struct scsi_xfer), 0,
-	    0, 0, "scxspl", NULL);
-	pool_setipl(&scsi_xfer_pool, IPL_BIO);
-	/* Initialize the scsi_plug pool */
-	pool_init(&scsi_plug_pool, sizeof(struct scsi_plug), 0,
-	    0, 0, "scsiplug", NULL);
-	pool_setipl(&scsi_plug_pool, IPL_BIO);
+	pool_init(&scsi_xfer_pool, sizeof(struct scsi_xfer), 0, IPL_BIO, 0,
+	    "scxspl", NULL);
+	pool_init(&scsi_plug_pool, sizeof(struct scsi_plug), 0, IPL_BIO, 0,
+	    "scsiplug", NULL);
 }
 
 int
diff --git a/sys/sys/pool.h b/sys/sys/pool.h
index 81fb8f956bf..243729b9fd3 100644
--- a/sys/sys/pool.h
+++ b/sys/sys/pool.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pool.h,v 1.62 2016/09/15 01:24:08 dlg Exp $	*/
+/*	$OpenBSD: pool.h,v 1.63 2016/09/15 02:00:16 dlg Exp $	*/
 /*	$NetBSD: pool.h,v 1.27 2001/06/06 22:00:17 rafal Exp $	*/
 
 /*-
@@ -173,10 +173,9 @@ struct pool_request {
 	void *pr_item;
 };
 
-void		pool_init(struct pool *, size_t, u_int, u_int, int,
+void		pool_init(struct pool *, size_t, u_int, int, int,
 		    const char *, struct pool_allocator *);
 void		pool_destroy(struct pool *);
-void		pool_setipl(struct pool *, int);
 void		pool_setlowat(struct pool *, int);
 void		pool_sethiwat(struct pool *, int);
 int		pool_sethardlimit(struct pool *, u_int, const char *, int);
diff --git a/sys/tmpfs/tmpfs_vfsops.c b/sys/tmpfs/tmpfs_vfsops.c
index 9197b0268d8..7c2ddd5b530 100644
--- a/sys/tmpfs/tmpfs_vfsops.c
+++ b/sys/tmpfs/tmpfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tmpfs_vfsops.c,v 1.11 2016/08/23 04:28:18 dlg Exp $	*/
+/*	$OpenBSD: tmpfs_vfsops.c,v 1.12 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: tmpfs_vfsops.c,v 1.52 2011/09/27 01:10:43 christos Exp $	*/
 
 /*
@@ -73,12 +73,10 @@ int
 tmpfs_init(struct vfsconf *vfsp)
 {
 
-	pool_init(&tmpfs_dirent_pool, sizeof(tmpfs_dirent_t), 0, 0, PR_WAITOK,
-	    "tmpfs_dirent", NULL);
-	pool_setipl(&tmpfs_dirent_pool, IPL_NONE);
-	pool_init(&tmpfs_node_pool, sizeof(tmpfs_node_t), 0, 0, PR_WAITOK,
-	    "tmpfs_node", NULL);
-	pool_setipl(&tmpfs_node_pool, IPL_NONE);
+	pool_init(&tmpfs_dirent_pool, sizeof(tmpfs_dirent_t), 0, IPL_NONE,
+	    PR_WAITOK, "tmpfs_dirent", NULL);
+	pool_init(&tmpfs_node_pool, sizeof(tmpfs_node_t), 0, IPL_NONE,
+	    PR_WAITOK, "tmpfs_node", NULL);
 
 	return 0;
 }
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index 67a77037fa7..05cab5e43a6 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_vfsops.c,v 1.96 2016/09/07 17:30:12 natano Exp $	*/
+/*	$OpenBSD: ext2fs_vfsops.c,v 1.97 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $	*/
 
 /*
@@ -93,12 +93,10 @@ extern u_long ext2gennumber;
 int
 ext2fs_init(struct vfsconf *vfsp)
 {
-	pool_init(&ext2fs_inode_pool, sizeof(struct inode), 0, 0, PR_WAITOK,
-	    "ext2inopl", NULL);
-	pool_setipl(&ext2fs_inode_pool, IPL_NONE);
-	pool_init(&ext2fs_dinode_pool, sizeof(struct ext2fs_dinode), 0, 0,
-	    PR_WAITOK, "ext2dinopl", NULL);
-	pool_setipl(&ext2fs_dinode_pool, IPL_NONE);
+	pool_init(&ext2fs_inode_pool, sizeof(struct inode), 0,
+	    IPL_NONE, PR_WAITOK, "ext2inopl", NULL);
+	pool_init(&ext2fs_dinode_pool, sizeof(struct ext2fs_dinode), 0,
+	    IPL_NONE, PR_WAITOK, "ext2dinopl", NULL);
 
 	return (ufs_init(vfsp));
 }
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index ba017b87717..6af3dbbe1c3 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_softdep.c,v 1.133 2016/06/19 10:21:56 dlg Exp $	*/
+/*	$OpenBSD: ffs_softdep.c,v 1.134 2016/09/15 02:00:18 dlg Exp $	*/
 
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -1175,48 +1175,34 @@ softdep_initialize(void)
 	newblk_hashtbl = hashinit(64, M_NEWBLK, M_WAITOK, &newblk_hash);
 	sema_init(&newblk_in_progress, "newblk", PRIBIO, 0);
 	timeout_set(&proc_waiting_timeout, pause_timer, NULL);
-	pool_init(&pagedep_pool, sizeof(struct pagedep), 0, 0, PR_WAITOK,
-	    "pagedep", NULL);
-	pool_setipl(&pagedep_pool, IPL_NONE);
-	pool_init(&inodedep_pool, sizeof(struct inodedep), 0, 0, PR_WAITOK,
-	    "inodedep", NULL);
-	pool_setipl(&inodedep_pool, IPL_NONE);
-	pool_init(&newblk_pool, sizeof(struct newblk), 0, 0, PR_WAITOK,
-	    "newblk", NULL);
-	pool_setipl(&newblk_pool, IPL_NONE);
-	pool_init(&bmsafemap_pool, sizeof(struct bmsafemap), 0, 0, PR_WAITOK,
-	    "bmsafemap", NULL);
-	pool_setipl(&bmsafemap_pool, IPL_NONE);
-	pool_init(&allocdirect_pool, sizeof(struct allocdirect), 0, 0, PR_WAITOK,
-	    "allocdir", NULL);
-	pool_setipl(&allocdirect_pool, IPL_NONE);
-	pool_init(&indirdep_pool, sizeof(struct indirdep), 0, 0, PR_WAITOK,
-	    "indirdep", NULL);
-	pool_setipl(&indirdep_pool, IPL_NONE);
-	pool_init(&allocindir_pool, sizeof(struct allocindir), 0, 0, PR_WAITOK,
-	    "allocindir", NULL);
-	pool_setipl(&allocindir_pool, IPL_NONE);
-	pool_init(&freefrag_pool, sizeof(struct freefrag), 0, 0, PR_WAITOK,
-	    "freefrag", NULL);
-	pool_setipl(&freefrag_pool, IPL_NONE);
-	pool_init(&freeblks_pool, sizeof(struct freeblks), 0, 0, PR_WAITOK,
-	    "freeblks", NULL);
-	pool_setipl(&freeblks_pool, IPL_NONE);
-	pool_init(&freefile_pool, sizeof(struct freefile), 0, 0, PR_WAITOK,
-	    "freefile", NULL);
-	pool_setipl(&freefile_pool, IPL_NONE);
-	pool_init(&diradd_pool, sizeof(struct diradd), 0, 0, PR_WAITOK,
-	    "diradd", NULL);
-	pool_setipl(&diradd_pool, IPL_NONE);
-	pool_init(&mkdir_pool, sizeof(struct mkdir), 0, 0, PR_WAITOK,
-	    "mkdir", NULL);
-	pool_setipl(&mkdir_pool, IPL_NONE);
-	pool_init(&dirrem_pool, sizeof(struct dirrem), 0, 0, PR_WAITOK,
-	    "dirrem", NULL);
-	pool_setipl(&dirrem_pool, IPL_NONE);
-	pool_init(&newdirblk_pool, sizeof(struct newdirblk), 0, 0, PR_WAITOK,
-	    "newdirblk", NULL);
-	pool_setipl(&newdirblk_pool, IPL_NONE);
+	pool_init(&pagedep_pool, sizeof(struct pagedep), 0, IPL_NONE,
+	    PR_WAITOK, "pagedep", NULL);
+	pool_init(&inodedep_pool, sizeof(struct inodedep), 0, IPL_NONE,
+	    PR_WAITOK, "inodedep", NULL);
+	pool_init(&newblk_pool, sizeof(struct newblk), 0, IPL_NONE,
+	    PR_WAITOK, "newblk", NULL);
+	pool_init(&bmsafemap_pool, sizeof(struct bmsafemap), 0, IPL_NONE,
+	    PR_WAITOK, "bmsafemap", NULL);
+	pool_init(&allocdirect_pool, sizeof(struct allocdirect), 0, IPL_NONE,
+	    PR_WAITOK, "allocdir", NULL);
+	pool_init(&indirdep_pool, sizeof(struct indirdep), 0, IPL_NONE,
+	    PR_WAITOK, "indirdep", NULL);
+	pool_init(&allocindir_pool, sizeof(struct allocindir), 0, IPL_NONE,
+	    PR_WAITOK, "allocindir", NULL);
+	pool_init(&freefrag_pool, sizeof(struct freefrag), 0, IPL_NONE,
+	    PR_WAITOK, "freefrag", NULL);
+	pool_init(&freeblks_pool, sizeof(struct freeblks), 0, IPL_NONE,
+	    PR_WAITOK, "freeblks", NULL);
+	pool_init(&freefile_pool, sizeof(struct freefile), 0, IPL_NONE,
+	    PR_WAITOK, "freefile", NULL);
+	pool_init(&diradd_pool, sizeof(struct diradd), 0, IPL_NONE,
+	    PR_WAITOK, "diradd", NULL);
+	pool_init(&mkdir_pool, sizeof(struct mkdir), 0, IPL_NONE,
+	    PR_WAITOK, "mkdir", NULL);
+	pool_init(&dirrem_pool, sizeof(struct dirrem), 0, IPL_NONE,
+	    PR_WAITOK, "dirrem", NULL);
+	pool_init(&newdirblk_pool, sizeof(struct newdirblk), 0, IPL_NONE,
+	    PR_WAITOK, "newdirblk", NULL);
 }
 
 /*
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 79f9803cd52..99eaf527aac 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_vfsops.c,v 1.163 2016/09/07 17:30:13 natano Exp $	*/
+/*	$OpenBSD: ffs_vfsops.c,v 1.164 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $	*/
 
 /*
@@ -1490,16 +1490,13 @@ ffs_init(struct vfsconf *vfsp)
 
 	done = 1;
 
-	pool_init(&ffs_ino_pool, sizeof(struct inode), 0, 0, PR_WAITOK,
-	    "ffsino", NULL);
-	pool_setipl(&ffs_ino_pool, IPL_NONE);
-	pool_init(&ffs_dinode1_pool, sizeof(struct ufs1_dinode), 0, 0,
+	pool_init(&ffs_ino_pool, sizeof(struct inode), 0, IPL_NONE,
+	    PR_WAITOK, "ffsino", NULL);
+	pool_init(&ffs_dinode1_pool, sizeof(struct ufs1_dinode), 0, IPL_NONE,
 	    PR_WAITOK, "dino1pl", NULL);
-	pool_setipl(&ffs_dinode1_pool, IPL_NONE);
 #ifdef FFS2
-	pool_init(&ffs_dinode2_pool, sizeof(struct ufs2_dinode), 0, 0,
+	pool_init(&ffs_dinode2_pool, sizeof(struct ufs2_dinode), 0, IPL_NONE,
 	    PR_WAITOK, "dino2pl", NULL);
-	pool_setipl(&ffs_dinode2_pool, IPL_NONE);
 #endif
 
 	softdep_initialize();
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index bb99f396eae..5ea1806625d 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_dirhash.c,v 1.37 2016/06/19 10:21:56 dlg Exp $	*/
+/* $OpenBSD: ufs_dirhash.c,v 1.38 2016/09/15 02:00:18 dlg Exp $	*/
 /*
  * Copyright (c) 2001, 2002 Ian Dowse.  All rights reserved.
  *
@@ -1047,9 +1047,8 @@ ufsdirhash_recycle(int wanted)
 void
 ufsdirhash_init(void)
 {
-	pool_init(&ufsdirhash_pool, DH_NBLKOFF * sizeof(doff_t), 0, 0,
+	pool_init(&ufsdirhash_pool, DH_NBLKOFF * sizeof(doff_t), 0, IPL_NONE,
 	    PR_WAITOK, "dirhash", NULL);
-	pool_setipl(&ufsdirhash_pool, IPL_NONE);
 	mtx_init(&ufsdirhash_mtx, IPL_NONE);
 	arc4random_buf(&ufsdirhash_key, sizeof(ufsdirhash_key));
 	TAILQ_INIT(&ufsdirhash_list);
diff --git a/sys/uvm/uvm_addr.c b/sys/uvm/uvm_addr.c
index cc920b12e9b..393155dd40c 100644
--- a/sys/uvm/uvm_addr.c
+++ b/sys/uvm/uvm_addr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_addr.c,v 1.18 2016/09/02 16:45:12 stefan Exp $	*/
+/*	$OpenBSD: uvm_addr.c,v 1.19 2016/09/15 02:00:18 dlg Exp $	*/
 
 /*
  * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl>
@@ -287,21 +287,16 @@ uvm_addr_fitspace(vaddr_t *min_result, vaddr_t *max_result,
 void
 uvm_addr_init(void)
 {
-	pool_init(&uaddr_pool, sizeof(struct uvm_addr_state),
-	    0, 0, PR_WAITOK, "uaddr", NULL);
-	pool_setipl(&uaddr_pool, IPL_VM);
-	pool_init(&uaddr_hint_pool, sizeof(struct uaddr_hint_state),
-	    0, 0, PR_WAITOK, "uaddrhint", NULL);
-	pool_setipl(&uaddr_hint_pool, IPL_VM);
-	pool_init(&uaddr_bestfit_pool, sizeof(struct uaddr_bestfit_state),
-	    0, 0, PR_WAITOK, "uaddrbest", NULL);
-	pool_setipl(&uaddr_bestfit_pool, IPL_VM);
-	pool_init(&uaddr_pivot_pool, sizeof(struct uaddr_pivot_state),
-	    0, 0, PR_WAITOK, "uaddrpivot", NULL);
-	pool_setipl(&uaddr_pivot_pool, IPL_VM);
-	pool_init(&uaddr_rnd_pool, sizeof(struct uaddr_rnd_state),
-	    0, 0, PR_WAITOK, "uaddrrnd", NULL);
-	pool_setipl(&uaddr_rnd_pool, IPL_VM);
+	pool_init(&uaddr_pool, sizeof(struct uvm_addr_state), 0,
+	    IPL_VM, PR_WAITOK, "uaddr", NULL);
+	pool_init(&uaddr_hint_pool, sizeof(struct uaddr_hint_state), 0,
+	    IPL_VM, PR_WAITOK, "uaddrhint", NULL);
+	pool_init(&uaddr_bestfit_pool, sizeof(struct uaddr_bestfit_state), 0,
+	    IPL_VM, PR_WAITOK, "uaddrbest", NULL);
+	pool_init(&uaddr_pivot_pool, sizeof(struct uaddr_pivot_state), 0,
+	    IPL_VM, PR_WAITOK, "uaddrpivot", NULL);
+	pool_init(&uaddr_rnd_pool, sizeof(struct uaddr_rnd_state), 0,
+	    IPL_VM, PR_WAITOK, "uaddrrnd", NULL);
 
 	uaddr_kbootstrap.uaddr_minaddr = PAGE_SIZE;
 	uaddr_kbootstrap.uaddr_maxaddr = -(vaddr_t)PAGE_SIZE;
diff --git a/sys/uvm/uvm_amap.c b/sys/uvm/uvm_amap.c
index 6e8653ccc8f..4bd2dfff36e 100644
--- a/sys/uvm/uvm_amap.c
+++ b/sys/uvm/uvm_amap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_amap.c,v 1.76 2016/07/27 14:48:56 tedu Exp $	*/
+/*	$OpenBSD: uvm_amap.c,v 1.77 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: uvm_amap.c,v 1.27 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -235,9 +235,8 @@ amap_init(void)
 	size_t size;
 
 	/* Initialize the vm_amap pool. */
-	pool_init(&uvm_amap_pool, sizeof(struct vm_amap), 0, 0, PR_WAITOK,
-	    "amappl", NULL);
-	pool_setipl(&uvm_amap_pool, IPL_NONE);
+	pool_init(&uvm_amap_pool, sizeof(struct vm_amap),
+	    0, IPL_NONE, PR_WAITOK, "amappl", NULL);
 	pool_sethiwat(&uvm_amap_pool, 4096);
 
 	/* initialize small amap pools */
@@ -246,16 +245,13 @@ amap_init(void)
 		    sizeof(amap_small_pool_names[0]), "amappl%d", i + 1);
 		size = offsetof(struct vm_amap, am_small.ac_anon) +
 		    (i + 1) * sizeof(struct vm_anon *);
-		pool_init(&uvm_small_amap_pool[i], size, 0, 0, 0,
-		    amap_small_pool_names[i], NULL);
-		pool_setipl(&uvm_small_amap_pool[i], IPL_NONE);
+		pool_init(&uvm_small_amap_pool[i], size, 0,
+		    IPL_NONE, 0, amap_small_pool_names[i], NULL);
 	}
 
-	pool_init(&uvm_amap_chunk_pool,
-	    sizeof(struct vm_amap_chunk) +
-	    UVM_AMAP_CHUNK * sizeof(struct vm_anon *), 0, 0, 0,
-	    "amapchunkpl", NULL);
-	pool_setipl(&uvm_amap_chunk_pool, IPL_NONE);
+	pool_init(&uvm_amap_chunk_pool, sizeof(struct vm_amap_chunk) +
+	    UVM_AMAP_CHUNK * sizeof(struct vm_anon *),
+	    0, IPL_NONE, 0, "amapchunkpl", NULL);
 	pool_sethiwat(&uvm_amap_chunk_pool, 4096);
 }
 
diff --git a/sys/uvm/uvm_anon.c b/sys/uvm/uvm_anon.c
index 4316f1eca57..33ed93b0f02 100644
--- a/sys/uvm/uvm_anon.c
+++ b/sys/uvm/uvm_anon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_anon.c,v 1.47 2016/06/17 10:48:25 dlg Exp $	*/
+/*	$OpenBSD: uvm_anon.c,v 1.48 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: uvm_anon.c,v 1.10 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -48,9 +48,8 @@ struct pool uvm_anon_pool;
 void
 uvm_anon_init(void)
 {
-	pool_init(&uvm_anon_pool, sizeof(struct vm_anon), 0, 0,
+	pool_init(&uvm_anon_pool, sizeof(struct vm_anon), 0, IPL_NONE,
 	    PR_WAITOK, "anonpl", NULL);
-	pool_setipl(&uvm_anon_pool, IPL_NONE);
 	pool_sethiwat(&uvm_anon_pool, uvmexp.free / 16);
 }
 
diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c
index e4abe6398f2..0b2a3503d64 100644
--- a/sys/uvm/uvm_aobj.c
+++ b/sys/uvm/uvm_aobj.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_aobj.c,v 1.81 2016/06/17 10:48:25 dlg Exp $	*/
+/*	$OpenBSD: uvm_aobj.c,v 1.82 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: uvm_aobj.c,v 1.39 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -797,13 +797,10 @@ uao_init(void)
 	 * NOTE: Pages for this pool must not come from a pageable
 	 * kernel map!
 	 */
-	pool_init(&uao_swhash_elt_pool, sizeof(struct uao_swhash_elt),
-	    0, 0, PR_WAITOK, "uaoeltpl", NULL);
-	pool_setipl(&uao_swhash_elt_pool, IPL_NONE);
-
-	pool_init(&uvm_aobj_pool, sizeof(struct uvm_aobj), 0, 0, PR_WAITOK,
-	    "aobjpl", NULL);
-	pool_setipl(&uvm_aobj_pool, IPL_NONE);
+	pool_init(&uao_swhash_elt_pool, sizeof(struct uao_swhash_elt), 0,
+	    IPL_NONE, PR_WAITOK, "uaoeltpl", NULL);
+	pool_init(&uvm_aobj_pool, sizeof(struct uvm_aobj), 0,
+	    IPL_NONE, PR_WAITOK, "aobjpl", NULL);
 }
 
 /*
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index a390187e86e..f34290a1280 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_map.c,v 1.222 2016/09/03 18:43:34 stefan Exp $	*/
+/*	$OpenBSD: uvm_map.c,v 1.223 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $	*/
 
 /*
@@ -2797,15 +2797,12 @@ uvm_map_init(void)
 	}
 
 	/* initialize the map-related pools. */
-	pool_init(&uvm_vmspace_pool, sizeof(struct vmspace),
-	    0, 0, PR_WAITOK, "vmsppl", NULL);
-	pool_setipl(&uvm_vmspace_pool, IPL_NONE);
-	pool_init(&uvm_map_entry_pool, sizeof(struct vm_map_entry),
-	    0, 0, PR_WAITOK, "vmmpepl", NULL);
-	pool_setipl(&uvm_map_entry_pool, IPL_VM);
-	pool_init(&uvm_map_entry_kmem_pool, sizeof(struct vm_map_entry),
-	    0, 0, 0, "vmmpekpl", NULL);
-	pool_setipl(&uvm_map_entry_kmem_pool, IPL_NONE);
+	pool_init(&uvm_vmspace_pool, sizeof(struct vmspace), 0,
+	    IPL_NONE, PR_WAITOK, "vmsppl", NULL);
+	pool_init(&uvm_map_entry_pool, sizeof(struct vm_map_entry), 0,
+	    IPL_VM, PR_WAITOK, "vmmpepl", NULL);
+	pool_init(&uvm_map_entry_kmem_pool, sizeof(struct vm_map_entry), 0,
+	    IPL_NONE, 0, "vmmpekpl", NULL);
 	pool_sethiwat(&uvm_map_entry_pool, 8192);
 
 	uvm_addr_init();
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index a2a3ad80226..d2edbcc44f4 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_swap.c,v 1.139 2015/11/01 19:03:33 semarie Exp $	*/
+/*	$OpenBSD: uvm_swap.c,v 1.140 2016/09/15 02:00:18 dlg Exp $	*/
 /*	$NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $	*/
 
 /*
@@ -279,12 +279,10 @@ uvm_swap_init(void)
 		panic("uvm_swap_init: extent_create failed");
 
 	/* allocate pools for structures used for swapping to files. */
-	pool_init(&vndxfer_pool, sizeof(struct vndxfer), 0, 0, 0, "swp vnx",
-	    NULL);
-	pool_setipl(&vndxfer_pool, IPL_BIO);
-	pool_init(&vndbuf_pool, sizeof(struct vndbuf), 0, 0, 0, "swp vnd",
-	    NULL);
-	pool_setipl(&vndbuf_pool, IPL_BIO);
+	pool_init(&vndxfer_pool, sizeof(struct vndxfer), 0, IPL_BIO, 0,
+	    "swp vnx", NULL);
+	pool_init(&vndbuf_pool, sizeof(struct vndbuf), 0, IPL_BIO, 0,
+	    "swp vnd", NULL);
 
 	/* Setup the initial swap partition */
 	swapmount();