Index: alpha/alpha/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/alpha/alpha/pmap.c,v
retrieving revision 1.82
diff -u -p -r1.82 pmap.c
--- alpha/alpha/pmap.c	22 Feb 2016 07:13:46 -0000	1.82
+++ alpha/alpha/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -838,12 +838,15 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
 	 * Initialize the pmap pools and list.
 	 */
 	pmap_ncpuids = ncpuids;
-	pool_init(&pmap_pmap_pool, PMAP_SIZEOF(pmap_ncpuids), 0, 0, 0, "pmappl",
-	    &pool_allocator_single);
+	pool_init(&pmap_pmap_pool, PMAP_SIZEOF(pmap_ncpuids), 0, 0, 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);
 
 	TAILQ_INIT(&pmap_all_pmaps);
 
Index: amd64/amd64/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/pmap.c,v
retrieving revision 1.98
diff -u -p -r1.98 pmap.c
--- amd64/amd64/pmap.c	8 Feb 2016 18:23:04 -0000	1.98
+++ amd64/amd64/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -737,18 +737,20 @@ pmap_bootstrap(paddr_t first_avail, padd
 	 * initialize the pmap pool.
 	 */
 
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, PR_WAITOK,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 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",
 	    &pool_allocator_single);
-	pool_sethiwat(&pmap_pv_pool, 32 * 1024);
 	pool_setipl(&pmap_pv_pool, IPL_VM);
+	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);
 
 	/*
 	 * ensure the TLB is sync'd with reality by flushing it...
Index: arm/arm/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/pmap.c,v
retrieving revision 1.63
diff -u -p -r1.63 pmap.c
--- arm/arm/pmap.c	22 Mar 2016 23:35:01 -0000	1.63
+++ arm/arm/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -3729,26 +3729,30 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt, 
 	/*
 	 * Initialize the pmap pool and cache
 	 */
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_single);
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 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,
 	    "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);
 
 	cpu_dcache_wbinv_all();
 }
Index: arm/arm/pmap7.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/pmap7.c,v
retrieving revision 1.24
diff -u -p -r1.24 pmap7.c
--- arm/arm/pmap7.c	3 Mar 2016 04:28:21 -0000	1.24
+++ arm/arm/pmap7.c	20 Apr 2016 12:28:50 -0000
@@ -2786,26 +2786,30 @@ pmap_bootstrap(pd_entry_t *kernel_l1pt, 
 	/*
 	 * Initialize the pmap pool.
 	 */
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_single);
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 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,
 	    "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);
 
 	cpu_dcache_wbinv_all();
 	cpu_sdcache_wbinv_all();
Index: hppa/hppa/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa/hppa/pmap.c,v
retrieving revision 1.168
diff -u -p -r1.168 pmap.c
--- hppa/hppa/pmap.c	30 Aug 2015 16:50:25 -0000	1.168
+++ hppa/hppa/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -631,8 +631,9 @@ pmap_init(void)
 {
 	DPRINTF(PDB_FOLLOW|PDB_INIT, ("pmap_init()\n"));
 
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, PR_WAITOK,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 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);
Index: hppa64/hppa64/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa64/hppa64/pmap.c,v
retrieving revision 1.28
diff -u -p -r1.28 pmap.c
--- hppa64/hppa64/pmap.c	6 Sep 2015 11:06:48 -0000	1.28
+++ hppa64/hppa64/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -545,10 +545,12 @@ pmap_init(void)
 {
 	DPRINTF(PDB_FOLLOW|PDB_INIT, ("pmap_init()\n"));
 
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, PR_WAITOK,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 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_setlowat(&pmap_pv_pool, pmap_pvlowat);
 	pool_sethiwat(&pmap_pv_pool, pmap_pvlowat * 32);
 
Index: i386/i386/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/pmap.c,v
retrieving revision 1.189
diff -u -p -r1.189 pmap.c
--- i386/i386/pmap.c	15 Mar 2016 03:17:51 -0000	1.189
+++ i386/i386/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -1026,8 +1026,9 @@ pmap_bootstrap(vaddr_t kva_start)
 	 * initialize the pmap pool.
 	 */
 
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 32, 0, PR_WAITOK,
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 32, 0, 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);
Index: m88k/m88k/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/m88k/m88k/pmap.c,v
retrieving revision 1.82
diff -u -p -r1.82 pmap.c
--- m88k/m88k/pmap.c	8 Sep 2015 21:28:36 -0000	1.82
+++ m88k/m88k/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -867,7 +867,9 @@ 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);
 }
 
 /*
Index: mips64/mips64/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/pmap.c,v
retrieving revision 1.86
diff -u -p -r1.86 pmap.c
--- mips64/mips64/pmap.c	1 Feb 2016 16:15:18 -0000	1.86
+++ mips64/mips64/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -372,10 +372,14 @@ 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_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);
 
 	pmap_kernel()->pm_count = 1;
 
Index: powerpc/powerpc/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/powerpc/powerpc/pmap.c,v
retrieving revision 1.163
diff -u -p -r1.163 pmap.c
--- powerpc/powerpc/pmap.c	8 Oct 2015 10:20:14 -0000	1.163
+++ powerpc/powerpc/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -2142,13 +2142,17 @@ pmap_real_memory(paddr_t *start, vsize_t
 void
 pmap_init()
 {
-	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmap", NULL);
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, 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_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_setlowat(&pmap_pted_pool, 20);
 
 	PMAP_HASH_LOCK_INIT();
Index: sh/sh/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/sh/sh/pmap.c,v
retrieving revision 1.24
diff -u -p -r1.24 pmap.c
--- sh/sh/pmap.c	5 Mar 2016 17:16:33 -0000	1.24
+++ sh/sh/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -203,10 +203,12 @@ void
 pmap_init(void)
 {
 	/* Initialize pmap module */
-	pool_init(&__pmap_pmap_pool, sizeof(struct pmap), 0, 0, 0, "pmappl",
-	    &pool_allocator_single);
+	pool_init(&__pmap_pmap_pool, sizeof(struct pmap), 0, 0, 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_setlowat(&__pmap_pv_pool, 16);
 }
 
Index: sparc/sparc/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc/sparc/pmap.c,v
retrieving revision 1.179
diff -u -p -r1.179 pmap.c
--- sparc/sparc/pmap.c	29 Dec 2015 04:46:28 -0000	1.179
+++ sparc/sparc/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -3489,6 +3489,7 @@ void
 pmap_init()
 {
 	pool_init(&pvpool, sizeof(struct pvlist), 0, 0, 0, "pvpl", NULL);
+	pool_setipl(&pvpool, IPL_VM);
 
 #if defined(SUN4M)
         if (CPU_ISSUN4M) {
@@ -3502,10 +3503,12 @@ pmap_init()
                 n = SRMMU_L1SIZE * sizeof(int);
                 pool_init(&L1_pool, n, n, 0, 0, "L1 pagetable",
 		    &pgt_allocator);
+		pool_setipl(&L1_pool, IPL_VM);
 
                 n = SRMMU_L2SIZE * sizeof(int);
                 pool_init(&L23_pool, n, n, 0, 0, "L2/L3 pagetable",
                     &pgt_allocator);
+		pool_setipl(&L23_pool, IPL_VM);
         }
 #endif
 }
Index: sparc64/sparc64/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/pmap.c,v
retrieving revision 1.96
diff -u -p -r1.96 pmap.c
--- sparc64/sparc64/pmap.c	27 Nov 2015 15:34:01 -0000	1.96
+++ sparc64/sparc64/pmap.c	20 Apr 2016 12:28:50 -0000
@@ -1380,8 +1380,9 @@ pmap_init(void)
 	/* 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, PR_WAITOK,
+	pool_init(&pmap_pool, sizeof(struct pmap), 0, 0, 0,
 	    "pmappl", NULL);
+	pool_setipl(&pmap_pool, IPL_NONE);
 }
 
 /* Start of non-cachable physical memory on UltraSPARC-III. */