diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-07-08 11:38:48 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-07-08 11:38:48 +0000 |
| commit | 48e2deb757a0511a522d8dd6436ab59335e0cfc9 (patch) | |
| tree | 9159072c91d5727192fe8b119e1f593522c76a3a /sys | |
| parent | We do not care about broken Borland C pre-processors. (diff) | |
| download | wireguard-openbsd-48e2deb757a0511a522d8dd6436ab59335e0cfc9.tar.xz wireguard-openbsd-48e2deb757a0511a522d8dd6436ab59335e0cfc9.zip | |
bye bye UBC; ok beck dlg
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/uvm/uvm_fault.c | 6 | ||||
| -rw-r--r-- | sys/uvm/uvm_mmap.c | 7 | ||||
| -rw-r--r-- | sys/uvm/uvm_param.h | 6 | ||||
| -rw-r--r-- | sys/uvm/uvm_pdaemon.c | 12 |
4 files changed, 4 insertions, 27 deletions
diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c index 4a795fece07..2664299c5c3 100644 --- a/sys/uvm/uvm_fault.c +++ b/sys/uvm/uvm_fault.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_fault.c,v 1.74 2014/07/03 11:38:46 kettenis Exp $ */ +/* $OpenBSD: uvm_fault.c,v 1.75 2014/07/08 11:38:48 deraadt Exp $ */ /* $NetBSD: uvm_fault.c,v 1.51 2000/08/06 00:22:53 thorpej Exp $ */ /* @@ -191,11 +191,7 @@ uvmfault_anonflush(struct vm_anon **anons, int n) if (pg && (pg->pg_flags & PG_BUSY) == 0 && pg->loan_count == 0) { uvm_lock_pageq(); if (pg->wire_count == 0) { -#ifdef UBC - pmap_clear_reference(pg); -#else pmap_page_protect(pg, VM_PROT_NONE); -#endif uvm_pagedeactivate(pg); } uvm_unlock_pageq(); diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c index 5b85d5ee81b..a8cdb821721 100644 --- a/sys/uvm/uvm_mmap.c +++ b/sys/uvm/uvm_mmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_mmap.c,v 1.96 2014/07/02 06:09:49 matthew Exp $ */ +/* $OpenBSD: uvm_mmap.c,v 1.97 2014/07/08 11:38:48 deraadt Exp $ */ /* $NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $ */ /* @@ -952,7 +952,6 @@ uvm_mmap(vm_map_t map, vaddr_t *addr, vsize_t size, vm_prot_t prot, uobj = uvn_attach(vp, (flags & MAP_SHARED) ? maxprot : (maxprot & ~VM_PROT_WRITE)); -#ifndef UBC /* * XXXCDC: hack from old code * don't allow vnodes which have been mapped @@ -982,10 +981,6 @@ uvm_mmap(vm_map_t map, vaddr_t *addr, vsize_t size, vm_prot_t prot, uvm_vnp_uncache(vp); } } -#else - /* XXX for now, attach doesn't gain a ref */ - vref(vp); -#endif } else { uobj = udv_attach(vp->v_rdev, (flags & MAP_SHARED) ? maxprot : diff --git a/sys/uvm/uvm_param.h b/sys/uvm/uvm_param.h index e54bb1d6e25..224f393be6d 100644 --- a/sys/uvm/uvm_param.h +++ b/sys/uvm/uvm_param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_param.h,v 1.15 2010/07/22 17:31:39 thib Exp $ */ +/* $OpenBSD: uvm_param.h,v 1.16 2014/07/08 11:38:48 deraadt Exp $ */ /* $NetBSD: uvm_param.h,v 1.5 2001/03/09 01:02:12 chs Exp $ */ /* @@ -152,10 +152,6 @@ struct _ps_strings { #define trunc_page(x) ((x) & ~PAGE_MASK) extern psize_t mem_size; /* size of physical memory (bytes) */ -#ifdef UBC -extern int ubc_nwins; /* number of UBC mapping windows */ -extern int ubc_winsize; /* size of a UBC mapping window */ -#endif #else /* out-of-kernel versions of round_page and trunc_page */ diff --git a/sys/uvm/uvm_pdaemon.c b/sys/uvm/uvm_pdaemon.c index 5fc88e8c8dd..6404fe6613f 100644 --- a/sys/uvm/uvm_pdaemon.c +++ b/sys/uvm/uvm_pdaemon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_pdaemon.c,v 1.67 2014/04/13 23:14:15 tedu Exp $ */ +/* $OpenBSD: uvm_pdaemon.c,v 1.68 2014/07/08 11:38:48 deraadt Exp $ */ /* $NetBSD: uvm_pdaemon.c,v 1.23 2000/08/20 10:24:14 bjh21 Exp $ */ /* @@ -689,16 +689,6 @@ uvmpd_scan_inactive(struct pglist *pglst) continue; } -#ifdef UBC - if (result == VM_PAGER_ERROR && - curproc == uvm.pagedaemon_proc) { - uvm_lock_pageq(); - nextpg = TAILQ_NEXT(p, pageq); - uvm_pageactivate(p); - continue; - } -#endif - /* clean up "p" if we have one */ if (p) { /* |