diff options
| author |   art <art@openbsd.org> | 2001-11-10 18:42:31 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2001-11-10 18:42:31 +0000 |
| commit | 1aa8821b3fef5a013a0455dd56b9fc1992185f59 (patch) | |
| tree | 2c7a2e67672f063a167ff309cb1280c37c2cf8b5 /sys/uvm/uvm_vnode.c | |
| parent | remove extra debug() (diff) | |
| download | wireguard-openbsd-1aa8821b3fef5a013a0455dd56b9fc1992185f59.tar.xz wireguard-openbsd-1aa8821b3fef5a013a0455dd56b9fc1992185f59.zip | |
Merge in some parts of the ubc work that has been done in NetBSD that are not
UBC, but prerequsites for it.
- Create a daemon that processes async I/O (swap and paging in the future)
requests that need processing in process context and that were processed
in the pagedaemon before.
- Convert some ugly ifdef DIAGNOSTIC code to less intrusive KASSERTs.
- misc other cleanups.
Diffstat (limited to 'sys/uvm/uvm_vnode.c')
| -rw-r--r-- | sys/uvm/uvm_vnode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c index e5e954eb9df..e921e4fb846 100644 --- a/sys/uvm/uvm_vnode.c +++ b/sys/uvm/uvm_vnode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_vnode.c,v 1.23 2001/11/07 02:55:51 art Exp $ */ +/* $OpenBSD: uvm_vnode.c,v 1.24 2001/11/10 18:42:32 art Exp $ */ /* $NetBSD: uvm_vnode.c,v 1.36 2000/11/24 20:34:01 chs Exp $ */ /* @@ -1609,7 +1609,7 @@ uvn_io(uvn, pps, npages, flags, rw) mapinflags = (rw == UIO_READ) ? UVMPAGER_MAPIN_READ : UVMPAGER_MAPIN_WRITE; - kva = uvm_pagermapin(pps, npages, NULL, mapinflags); + kva = uvm_pagermapin(pps, npages, mapinflags); if (kva == 0 && waitf == M_NOWAIT) { simple_unlock(&uvn->u_obj.vmobjlock); UVMHIST_LOG(maphist,"<- mapin failed (try again)",0,0,0,0); @@ -1626,7 +1626,7 @@ uvn_io(uvn, pps, npages, flags, rw) simple_unlock(&uvn->u_obj.vmobjlock); /* NOTE: object now unlocked */ if (kva == 0) - kva = uvm_pagermapin(pps, npages, NULL, + kva = uvm_pagermapin(pps, npages, mapinflags | UVMPAGER_MAPIN_WAITOK); /* |