convert pool_init nointr to waitok

diff --git a/sys/uvm/uvm_amap.c b/sys/uvm/uvm_amap.c
index e3cdbf3..25f5ae1 100644 (file)
--- a/sys/uvm/uvm_amap.c
+++ b/sys/uvm/uvm_amap.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uvm_amap.c,v 1.57 2014/12/17 19:42:15 tedu Exp $      */
+/*     $OpenBSD: uvm_amap.c,v 1.58 2014/12/23 04:56:47 tedu Exp $      */
 /*     $NetBSD: uvm_amap.c,v 1.27 2000/11/25 06:27:59 chs Exp $        */
 
 /*
@@ -152,8 +152,8 @@ void
 amap_init(void)
 {
        /* Initialize the vm_amap pool. */
-       pool_init(&uvm_amap_pool, sizeof(struct vm_amap), 0, 0, 0,
-           "amappl", &pool_allocator_nointr);
+       pool_init(&uvm_amap_pool, sizeof(struct vm_amap), 0, 0, PR_WAITOK,
+           "amappl", NULL);
        pool_sethiwat(&uvm_amap_pool, 4096);
 }
 

diff --git a/sys/uvm/uvm_anon.c b/sys/uvm/uvm_anon.c
index d66b79d..4cea580 100644 (file)
--- a/sys/uvm/uvm_anon.c
+++ b/sys/uvm/uvm_anon.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uvm_anon.c,v 1.42 2014/12/17 19:42:15 tedu Exp $      */
+/*     $OpenBSD: uvm_anon.c,v 1.43 2014/12/23 04:56:47 tedu Exp $      */
 /*     $NetBSD: uvm_anon.c,v 1.10 2000/11/25 06:27:59 chs Exp $        */
 
 /*
@@ -48,8 +48,8 @@ struct pool uvm_anon_pool;
 void
 uvm_anon_init(void)
 {
-       pool_init(&uvm_anon_pool, sizeof(struct vm_anon), 0, 0, 0, "anonpl",
-           &pool_allocator_nointr);
+       pool_init(&uvm_anon_pool, sizeof(struct vm_anon), 0, 0,
+           PR_WAITOK, "anonpl", NULL);
        pool_sethiwat(&uvm_anon_pool, uvmexp.free / 16);
 }
 

diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c
index 8c0c281..4f0f116 100644 (file)
--- a/sys/uvm/uvm_aobj.c
+++ b/sys/uvm/uvm_aobj.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uvm_aobj.c,v 1.75 2014/12/18 23:59:28 tedu Exp $      */
+/*     $OpenBSD: uvm_aobj.c,v 1.76 2014/12/23 04:56:47 tedu Exp $      */
 /*     $NetBSD: uvm_aobj.c,v 1.39 2001/02/18 21:19:08 chs Exp $        */
 
 /*
@@ -798,10 +798,10 @@ uao_init(void)
         * kernel map!
         */
        pool_init(&uao_swhash_elt_pool, sizeof(struct uao_swhash_elt),
-           0, 0, 0, "uaoeltpl", &pool_allocator_nointr);
+           0, 0, PR_WAITOK, "uaoeltpl", NULL);
 
-       pool_init(&uvm_aobj_pool, sizeof(struct uvm_aobj), 0, 0, 0,
-           "aobjpl", &pool_allocator_nointr);
+       pool_init(&uvm_aobj_pool, sizeof(struct uvm_aobj), 0, 0, PR_WAITOK,
+           "aobjpl", NULL);
 }
 
 /*