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, 3 insertions, 4 deletions

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); */
 	}
 }