diff options
| author |   art <art@openbsd.org> | 2001-03-09 14:20:50 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2001-03-09 14:20:50 +0000 |
| commit | ca5e00e5a50ba6987f61aa7a4b473b2a8c0a5104 (patch) | |
| tree | cd56a7456a7ea66060aa7398ad5cb406100efdf5 /sys/uvm/uvm_fault.c | |
| parent | "/altroot" -> "/altroot/", so that it is clear this is a directory. (diff) | |
| download | wireguard-openbsd-ca5e00e5a50ba6987f61aa7a4b473b2a8c0a5104.tar.xz wireguard-openbsd-ca5e00e5a50ba6987f61aa7a4b473b2a8c0a5104.zip | |
More syncing to NetBSD.
Implements mincore(2), mlockall(2) and munlockall(2). mlockall and munlockall
are disabled for the moment.
The rest is mostly cosmetic.
Diffstat (limited to 'sys/uvm/uvm_fault.c')
| -rw-r--r-- | sys/uvm/uvm_fault.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c index 0834cd17eb2..4be4a10c3f7 100644 --- a/sys/uvm/uvm_fault.c +++ b/sys/uvm/uvm_fault.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uvm_fault.c,v 1.7 2001/03/08 15:21:36 smart Exp $ */ -/* $NetBSD: uvm_fault.c,v 1.33 1999/06/04 23:38:41 thorpej Exp $ */ +/* $OpenBSD: uvm_fault.c,v 1.8 2001/03/09 14:20:51 art Exp $ */ +/* $NetBSD: uvm_fault.c,v 1.35 1999/06/16 18:43:28 thorpej Exp $ */ /* * @@ -646,7 +646,7 @@ ReFault: */ enter_prot = ufi.entry->protection; - wired = (ufi.entry->wired_count != 0) || (fault_type == VM_FAULT_WIRE); + wired = VM_MAPENT_ISWIRED(ufi.entry) || (fault_type == VM_FAULT_WIRE); if (wired) access_type = enter_prot; /* full access for wired */ @@ -846,7 +846,7 @@ ReFault: VM_PAGE_TO_PHYS(anon->u.an_page), (anon->an_ref > 1) ? (enter_prot & ~VM_PROT_WRITE) : enter_prot, - (ufi.entry->wired_count != 0), 0); + VM_MAPENT_ISWIRED(ufi.entry), 0); } simple_unlock(&anon->an_lock); } @@ -1734,8 +1734,7 @@ uvm_fault_wire(map, start, end, access_type) /* * now fault it in page at a time. if the fault fails then we have - * to undo what we have done. note that in uvm_fault VM_PROT_NONE - * is replaced with the max protection if fault_type is VM_FAULT_WIRE. + * to undo what we have done. */ for (va = start ; va < end ; va += PAGE_SIZE) { |