From: tedu <tedu@openbsd.org>
Date: Tue, 23 Dec 2014 07:42:46 +0000 (+0000)
Subject: change pmap pools from nointr to waitok. pvpool left alone for now.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f3385079e1099facae24798f55bf094d5cddd838;p=openbsd

change pmap pools from nointr to waitok. pvpool left alone for now.
---

diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c
index d10599e49db..da7b0e8e876 100644
--- a/sys/arch/amd64/amd64/pmap.c
+++ b/sys/arch/amd64/amd64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.82 2014/12/15 04:54:44 tedu Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.83 2014/12/23 07:42:46 tedu Exp $	*/
 /*	$NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $	*/
 
 /*
@@ -681,8 +681,8 @@ 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, "pmappl",
-	    &pool_allocator_nointr);
+	pool_init(&pmap_pmap_pool, sizeof(struct pmap), 0, 0, PR_WAITOK,
+	    "pmappl", NULL);
 	pool_init(&pmap_pv_pool, sizeof(struct pv_entry), 0, 0, 0, "pvpl",
 	    &pool_allocator_nointr);
 	pool_sethiwat(&pmap_pv_pool, 32 * 1024);
@@ -691,8 +691,7 @@ pmap_bootstrap(paddr_t first_avail, paddr_t max_pa)
 	 * initialize the PDE pool.
 	 */
 
-	pool_init(&pmap_pdp_pool, PAGE_SIZE, 0, 0, 0, "pdppl",
-	    &pool_allocator_nointr);
+	pool_init(&pmap_pdp_pool, PAGE_SIZE, 0, 0, PR_WAITOK, "pdppl", NULL);
 
 	/*
 	 * ensure the TLB is sync'd with reality by flushing it...