diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-03-12 21:08:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-03-12 21:08:05 +0000 |
| commit | 96856538805f252d5569925ea812934bd9c82e94 (patch) | |
| tree | 00c96efaa5f35f5257b301e2f8d0262e90e03360 /sys | |
| parent | ea71a2fe8cae8682412a1688d23c0940244e699a (diff) | |
preserving main-branch topology for a perverse reason:
step 2 - re-merge 1.119 (the WAITOK diff)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/uvm/uvm_page.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c index 32b5ef8f0d0..18195da69cc 100644 --- a/sys/uvm/uvm_page.c +++ b/sys/uvm/uvm_page.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_page.c,v 1.120 2013/03/12 21:07:02 deraadt Exp $ */ +/* $OpenBSD: uvm_page.c,v 1.121 2013/03/12 21:08:04 deraadt Exp $ */ /* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */ /* @@ -819,7 +819,7 @@ uvm_pglistalloc(psize_t size, paddr_t low, paddr_t high, paddr_t alignment, if ((uvmexp.free <= uvmexp.reserve_pagedaemon && !((curproc == uvm.pagedaemon_proc) || (curproc == syncerproc)))) { - if (UVM_PLA_WAITOK) { + if (flags & UVM_PLA_WAITOK) { uvm_wait("uvm_pglistalloc"); goto again; } |