diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-12-19 08:58:08 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-12-19 08:58:08 +0000 |
| commit | d8afae924f4db99650aa0df115c6ae66ed02b950 (patch) | |
| tree | a2cbc045f0eb624a394f8e45fea1a58ecf1faaf0 /sys/uvm/uvm_io.c | |
| parent | 4a6c79ff4f05aaae32458104529a9a9e0d3d208b (diff) | |
UBC was a disaster. It worked very good when it worked, but on some
machines or some configurations or in some phase of the moon (we actually
don't know when or why) files disappeared. Since we've not been able to
track down the problem in two weeks intense debugging and we need -current
to be stable, back out everything to a state it had before UBC.
We apologise for the inconvenience.
Diffstat (limited to 'sys/uvm/uvm_io.c')
| -rw-r--r-- | sys/uvm/uvm_io.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/uvm/uvm_io.c b/sys/uvm/uvm_io.c index 100e82cfe3b..ecb007827dc 100644 --- a/sys/uvm/uvm_io.c +++ b/sys/uvm/uvm_io.c @@ -1,5 +1,5 @@ -/* $OpenBSD: uvm_io.c,v 1.12 2001/11/28 19:28:14 art Exp $ */ -/* $NetBSD: uvm_io.c,v 1.15 2001/06/02 18:09:26 chs Exp $ */ +/* $OpenBSD: uvm_io.c,v 1.13 2001/12/19 08:58:07 art Exp $ */ +/* $NetBSD: uvm_io.c,v 1.12 2000/06/27 17:29:23 mrg Exp $ */ /* * @@ -61,12 +61,12 @@ int uvm_io(map, uio) - struct vm_map *map; + vm_map_t map; struct uio *uio; { vaddr_t baseva, endva, pageoffset, kva; vsize_t chunksz, togo, sz; - struct vm_map_entry *dead_entries; + vm_map_entry_t dead_entries; int error; /* @@ -106,7 +106,7 @@ uvm_io(map, uio) */ error = uvm_map_extract(map, baseva, chunksz, kernel_map, &kva, - UVM_EXTRACT_QREF | UVM_EXTRACT_CONTIG | + UVM_EXTRACT_QREF | UVM_EXTRACT_CONTIG | UVM_EXTRACT_FIXPROT); if (error) { @@ -138,7 +138,8 @@ uvm_io(map, uio) */ vm_map_lock(kernel_map); - uvm_unmap_remove(kernel_map, kva, kva + chunksz, &dead_entries); + (void)uvm_unmap_remove(kernel_map, kva, kva+chunksz, + &dead_entries); vm_map_unlock(kernel_map); if (dead_entries != NULL) |