diff options
| author |   smart <smart@openbsd.org> | 2001-06-23 19:24:33 +0000 |
|---|---|---|
| committer | smart <smart@openbsd.org> | 2001-06-23 19:24:33 +0000 |
| commit | e920f2c9e7a326843cbb9b0246822e192f052ab4 (patch) | |
| tree | 4a3ad62ac482a75a102f6f462d64a8949b32b77f /sys/uvm/uvm_fault.c | |
| parent | pidfile/sigterm race; bbraun@synack.net (diff) | |
| download | wireguard-openbsd-e920f2c9e7a326843cbb9b0246822e192f052ab4.tar.xz wireguard-openbsd-e920f2c9e7a326843cbb9b0246822e192f052ab4.zip | |
Sync with NetBSD 19990911 (just before PMAP_NEW was required)
- thread_sleep_msg() -> uvm_sleep()
- initialize reference count lock in uvm_anon_{init,add}()
- add uao_flush()
- replace boolean 'islocked' with 'lockflags'
- in uvm_fault() change FALSE to TRUE to in 'wide' fault handling
- get rid of uvm_km_get()
- various bug fixes
Diffstat (limited to 'sys/uvm/uvm_fault.c')
| -rw-r--r-- | sys/uvm/uvm_fault.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c index dfbff5be96a..2db0ebe05e1 100644 --- a/sys/uvm/uvm_fault.c +++ b/sys/uvm/uvm_fault.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uvm_fault.c,v 1.13 2001/06/08 08:09:38 art Exp $ */ -/* $NetBSD: uvm_fault.c,v 1.40 1999/07/08 18:11:03 thorpej Exp $ */ +/* $OpenBSD: uvm_fault.c,v 1.14 2001/06/23 19:24:33 smart Exp $ */ +/* $NetBSD: uvm_fault.c,v 1.44 1999/07/22 22:58:38 thorpej Exp $ */ /* * @@ -724,7 +724,7 @@ ReFault: npages = nback + nforw + 1; centeridx = nback; - narrow = FALSE; /* ensure only once per-fault */ + narrow = TRUE; /* ensure only once per-fault */ } else { @@ -843,8 +843,8 @@ ReFault: uvmexp.fltnamap++; pmap_enter(ufi.orig_map->pmap, currva, VM_PAGE_TO_PHYS(anon->u.an_page), - (anon->an_ref > 1) ? - (enter_prot & ~VM_PROT_WRITE) : enter_prot, + (anon->an_ref > 1) ? (enter_prot & ~VM_PROT_WRITE) : + enter_prot, VM_MAPENT_ISWIRED(ufi.entry), 0); } simple_unlock(&anon->an_lock); |