diff options
| author |   tedu <tedu@openbsd.org> | 2014-12-23 02:01:57 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-12-23 02:01:57 +0000 |
| commit | 4b1fb1317d4c47f8ff243e32b38e5af46a4afb4a (patch) | |
| tree | b2b75c664a71f10d6d07cf0f70220837677af1fa | |
| parent | correctly handle scaling units after .PD (diff) | |
| download | wireguard-openbsd-4b1fb1317d4c47f8ff243e32b38e5af46a4afb4a.tar.xz wireguard-openbsd-4b1fb1317d4c47f8ff243e32b38e5af46a4afb4a.zip | |
convert nointr pool_init argument to pr_waitok
| -rw-r--r-- | sys/uvm/uvm_addr.c | 12 | ||||
| -rw-r--r-- | sys/uvm/uvm_map.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/uvm/uvm_addr.c b/sys/uvm/uvm_addr.c index b9367cbcfff..f8357ca42da 100644 --- a/sys/uvm/uvm_addr.c +++ b/sys/uvm/uvm_addr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_addr.c,v 1.10 2014/11/18 02:37:31 tedu Exp $ */ +/* $OpenBSD: uvm_addr.c,v 1.11 2014/12/23 02:01:57 tedu Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl> @@ -280,15 +280,15 @@ void uvm_addr_init(void) { pool_init(&uaddr_pool, sizeof(struct uvm_addr_state), - 0, 0, 0, "uaddr", &pool_allocator_nointr); + 0, 0, PR_WAITOK, "uaddr", NULL); pool_init(&uaddr_hint_pool, sizeof(struct uaddr_hint_state), - 0, 0, 0, "uaddrhint", &pool_allocator_nointr); + 0, 0, PR_WAITOK, "uaddrhint", NULL); pool_init(&uaddr_bestfit_pool, sizeof(struct uaddr_bestfit_state), - 0, 0, 0, "uaddrbest", &pool_allocator_nointr); + 0, 0, PR_WAITOK, "uaddrbest", NULL); pool_init(&uaddr_pivot_pool, sizeof(struct uaddr_pivot_state), - 0, 0, 0, "uaddrpivot", &pool_allocator_nointr); + 0, 0, PR_WAITOK, "uaddrpivot", NULL); pool_init(&uaddr_rnd_pool, sizeof(struct uaddr_rnd_state), - 0, 0, 0, "uaddrrnd", &pool_allocator_nointr); + 0, 0, PR_WAITOK, "uaddrrnd", NULL); uaddr_kbootstrap.uaddr_minaddr = PAGE_SIZE; uaddr_kbootstrap.uaddr_maxaddr = -(vaddr_t)PAGE_SIZE; diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index fe2ee760d5c..29032ea4b00 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map.c,v 1.181 2014/12/05 04:12:48 uebayasi Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.182 2014/12/23 02:01:57 tedu Exp $ */ /* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */ /* @@ -2594,9 +2594,9 @@ uvm_map_init(void) /* initialize the map-related pools. */ pool_init(&uvm_vmspace_pool, sizeof(struct vmspace), - 0, 0, 0, "vmsppl", &pool_allocator_nointr); + 0, 0, PR_WAITOK, "vmsppl", NULL); pool_init(&uvm_map_entry_pool, sizeof(struct vm_map_entry), - 0, 0, 0, "vmmpepl", &pool_allocator_nointr); + 0, 0, PR_WAITOK, "vmmpepl", NULL); pool_init(&uvm_map_entry_kmem_pool, sizeof(struct vm_map_entry), 0, 0, 0, "vmmpekpl", NULL); pool_sethiwat(&uvm_map_entry_pool, 8192); |