change pmap pools from nointr to waitok. pvpool left alone for now.
authortedu <tedu@openbsd.org>
Tue, 23 Dec 2014 07:42:46 +0000 (07:42 +0000)
committertedu <tedu@openbsd.org>
Tue, 23 Dec 2014 07:42:46 +0000 (07:42 +0000)
sys/arch/amd64/amd64/pmap.c

index d10599e..da7b0e8 100644 (file)
@@ -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...