diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2013-05-30 16:39:27 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2013-05-30 16:39:27 +0000 |
| commit | 5586745861b37857799b4d913397195318e28d15 (patch) | |
| tree | 3c8ad68572838e0b93533eb46fb79a97e12bbe5f /sys/uvm/uvm_fault.c | |
| parent | af3070bdd7597a04785c2e13047f208c8cdac9af (diff) | |
UVM_UNLOCK_AND_WAIT no longer unlocks, so rename it to UVM_WAIT.
Diffstat (limited to 'sys/uvm/uvm_fault.c')
| -rw-r--r-- | sys/uvm/uvm_fault.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c index 2f802f99ab0..d36a3c95d64 100644 --- a/sys/uvm/uvm_fault.c +++ b/sys/uvm/uvm_fault.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_fault.c,v 1.67 2013/05/30 16:29:46 tedu Exp $ */ +/* $OpenBSD: uvm_fault.c,v 1.68 2013/05/30 16:39:26 tedu Exp $ */ /* $NetBSD: uvm_fault.c,v 1.51 2000/08/06 00:22:53 thorpej Exp $ */ /* @@ -341,14 +341,11 @@ uvmfault_anonget(struct uvm_faultinfo *ufi, struct vm_amap *amap, */ if (pg->uobject) { /* owner is uobject ? */ uvmfault_unlockall(ufi, amap, NULL, anon); - UVM_UNLOCK_AND_WAIT(pg, - &pg->uobject->vmobjlock, - FALSE, "anonget1",0); + UVM_WAIT(pg, FALSE, "anonget1",0); } else { /* anon owns page */ uvmfault_unlockall(ufi, amap, NULL, NULL); - UVM_UNLOCK_AND_WAIT(pg,&anon->an_lock,0, - "anonget2",0); + UVM_WAIT(pg, 0, "anonget2", 0); } /* ready to relock and try again */ |