diff options
| author |   miod <miod@openbsd.org> | 2015-09-09 14:52:12 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2015-09-09 14:52:12 +0000 |
| commit | 7df30446ac96b46535b7a4cda13a55fcfc8692f9 (patch) | |
| tree | 70938bfadebc2cdb8053af9508f598cd472193a7 | |
| parent | Cleanup the iov handling in ping6. Use the global iov instead of a local (diff) | |
| download | wireguard-openbsd-7df30446ac96b46535b7a4cda13a55fcfc8692f9.tar.xz wireguard-openbsd-7df30446ac96b46535b7a4cda13a55fcfc8692f9.zip | |
All our pmap implementations provide pmap_resident_count(), so remove
#ifndef pmap_resident_count code paths.
| -rw-r--r-- | sys/uvm/uvm_extern.h | 6 | ||||
| -rw-r--r-- | sys/uvm/uvm_fault.c | 16 | ||||
| -rw-r--r-- | sys/uvm/uvm_map.c | 7 |
3 files changed, 3 insertions, 26 deletions
diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h index b7b78649ed9..5caa7bae34d 100644 --- a/sys/uvm/uvm_extern.h +++ b/sys/uvm/uvm_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_extern.h,v 1.133 2015/07/19 21:21:14 beck Exp $ */ +/* $OpenBSD: uvm_extern.h,v 1.134 2015/09/09 14:52:12 miod Exp $ */ /* $NetBSD: uvm_extern.h,v 1.57 2001/03/09 01:02:12 chs Exp $ */ /* @@ -268,11 +268,7 @@ extern vaddr_t vm_min_kernel_address; #define uvm_km_zalloc(MAP,SIZE) uvm_km_alloc1(MAP,SIZE,0,TRUE) #define uvm_km_alloc(MAP,SIZE) uvm_km_alloc1(MAP,SIZE,0,FALSE) -#ifdef pmap_resident_count #define vm_resident_count(vm) (pmap_resident_count((vm)->vm_map.pmap)) -#else -#define vm_resident_count(vm) ((vm)->vm_rssize) -#endif void vmapbuf(struct buf *, vsize_t); void vunmapbuf(struct buf *, vsize_t); diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c index a9bf2889fb2..8104ee7c82c 100644 --- a/sys/uvm/uvm_fault.c +++ b/sys/uvm/uvm_fault.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_fault.c,v 1.85 2015/08/21 16:04:35 visa Exp $ */ +/* $OpenBSD: uvm_fault.c,v 1.86 2015/09/09 14:52:12 miod Exp $ */ /* $NetBSD: uvm_fault.c,v 1.51 2000/08/06 00:22:53 thorpej Exp $ */ /* @@ -443,9 +443,6 @@ uvmfault_update_stats(struct uvm_faultinfo *ufi) struct vm_map *map; struct proc *p; vsize_t res; -#ifndef pmap_resident_count - struct vm_space *vm; -#endif map = ufi->orig_map; @@ -454,18 +451,7 @@ uvmfault_update_stats(struct uvm_faultinfo *ufi) p = curproc; KASSERT(p != NULL && &p->p_vmspace->vm_map == map); -#ifdef pmap_resident_count res = pmap_resident_count(map->pmap); -#else - /* - * Rather inaccurate, but this is the current anon size - * of the vmspace. It's basically the resident size - * minus the mmapped in files/text. - */ - vm = (struct vmspace*)map; - res = vm->dsize; -#endif - /* Convert res from pages to kilobytes. */ res <<= (PAGE_SHIFT - 10); diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index 624ee523c19..0e846ff5832 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map.c,v 1.196 2015/09/01 05:49:37 deraadt Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.197 2015/09/09 14:52:12 miod Exp $ */ /* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */ /* @@ -2819,13 +2819,8 @@ uvm_map_printit(struct vm_map *map, boolean_t full, (*pr)("\tsz=%u, ref=%d, version=%u, flags=0x%x\n", map->size, map->ref_count, map->timestamp, map->flags); -#ifdef pmap_resident_count (*pr)("\tpmap=%p(resident=%d)\n", map->pmap, pmap_resident_count(map->pmap)); -#else - /* XXXCDC: this should be required ... */ - (*pr)("\tpmap=%p(resident=<<NOT SUPPORTED!!!>>)\n", map->pmap); -#endif /* struct vmspace handling. */ if (map->flags & VM_MAP_ISVMSPACE) { |