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);

1 files changed, 5 insertions, 7 deletions

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();