diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c index 5fdbb342c70d..7310d41c3acf 100644 --- a/sys/alpha/alpha/pmap.c +++ b/sys/alpha/alpha/pmap.c @@ -2125,9 +2125,7 @@ pmap_page_exists_quick(pmap, m) * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2146,11 +2144,6 @@ pmap_remove_pages(pmap, sva, eva) pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index db8bad1b3c5c..7f403beb718a 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2604,9 +2604,7 @@ pmap_page_exists_quick(pmap, m) * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2622,11 +2620,6 @@ pmap_remove_pages(pmap, sva, eva) PMAP_LOCK(pmap); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c index ca887f5339d1..d52baef27033 100644 --- a/sys/arm/arm/pmap.c +++ b/sys/arm/arm/pmap.c @@ -2811,7 +2811,7 @@ pmap_page_protect(vm_page_t m, vm_prot_t prot) * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +pmap_remove_pages(pmap_t pmap) { struct pv_entry *pv, *npv; struct l2_bucket *l2b = NULL; @@ -2820,10 +2820,6 @@ pmap_remove_pages(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) vm_page_lock_queues(); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } if (pv->pv_flags & PVF_WIRED) { /* The page is wired, cannot remove it now. */ npv = TAILQ_NEXT(pv, pv_plist); diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 7bf6a049da89..8b7cba1bc2c4 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -2611,9 +2611,7 @@ pmap_page_exists_quick(pmap, m) * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap, sva, eva) - pmap_t pmap; - vm_offset_t sva, eva; +pmap_remove_pages(pmap_t pmap) { pt_entry_t *pte, tpte; vm_page_t m; @@ -2630,11 +2628,6 @@ pmap_remove_pages(pmap, sva, eva) sched_pin(); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { - if (pv->pv_va >= eva || pv->pv_va < sva) { - npv = TAILQ_NEXT(pv, pv_plist); - continue; - } - #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c index 2407d3d17aef..a00bbcf47322 100644 --- a/sys/ia64/ia64/pmap.c +++ b/sys/ia64/ia64/pmap.c @@ -1862,7 +1862,7 @@ pmap_page_exists_quick(pmap_t pmap, vm_page_t m) * in the case of running down an entire address space. */ void -pmap_remove_pages(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +pmap_remove_pages(pmap_t pmap) { pmap_t oldpmap; pv_entry_t pv, npv; @@ -1881,9 +1881,6 @@ pmap_remove_pages(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) npv = TAILQ_NEXT(pv, pv_plist); - if (pv->pv_va >= eva || pv->pv_va < sva) - continue; - pte = pmap_find_vhpt(pv->pv_va); KASSERT(pte != NULL, ("pte")); if (!pmap_wired(pte)) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index acc64d2dd387..de6897a5e530 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -905,8 +905,7 @@ exec_new_vmspace(imgp, sv) if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv->sv_minuser && vm_map_max(map) == sv->sv_maxuser) { shmexit(vmspace); - pmap_remove_pages(vmspace_pmap(vmspace), vm_map_min(map), - vm_map_max(map)); + pmap_remove_pages(vmspace_pmap(vmspace)); vm_map_remove(map, vm_map_min(map), vm_map_max(map)); } else { vmspace_exec(p, sv->sv_minuser, sv->sv_maxuser); diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 9c469f763512..86e6fc38beb8 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -325,8 +325,7 @@ exit1(struct thread *td, int rv) while (!atomic_cmpset_int(&vm->vm_refcnt, refcnt, refcnt - 1)); if (refcnt == 1) { shmexit(vm); - pmap_remove_pages(vmspace_pmap(vm), vm_map_min(&vm->vm_map), - vm_map_max(&vm->vm_map)); + pmap_remove_pages(vmspace_pmap(vm)); (void) vm_map_remove(&vm->vm_map, vm_map_min(&vm->vm_map), vm_map_max(&vm->vm_map)); } diff --git a/sys/powerpc/powerpc/mmu_if.m b/sys/powerpc/powerpc/mmu_if.m index 0289973e9663..fde7765770b0 100644 --- a/sys/powerpc/powerpc/mmu_if.m +++ b/sys/powerpc/powerpc/mmu_if.m @@ -85,8 +85,7 @@ CODE { return; } - static void mmu_null_remove_pages(mmu_t mmu, pmap_t pmap, - vm_offset_t start, vm_offset_t end) + static void mmu_null_remove_pages(mmu_t mmu, pmap_t pmap) { return; } @@ -543,8 +542,6 @@ METHOD void remove_all { METHOD void remove_pages { mmu_t _mmu; pmap_t _pmap; - vm_offset_t _start; - vm_offset_t _end; } DEFAULT mmu_null_remove_pages; diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c index 2fb2eb1dd5f8..2a20fc5e008c 100644 --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -244,9 +244,9 @@ pmap_remove_all(vm_page_t m) } void -pmap_remove_pages(pmap_t pmap, vm_offset_t start, vm_offset_t end) +pmap_remove_pages(pmap_t pmap) { - MMU_REMOVE_PAGES(mmu_obj, pmap, start, end); + MMU_REMOVE_PAGES(mmu_obj, pmap); } void diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c index 288f0f66e5a6..163bbee45025 100644 --- a/sys/sparc64/sparc64/pmap.c +++ b/sys/sparc64/sparc64/pmap.c @@ -1698,7 +1698,7 @@ pmap_page_exists_quick(pmap_t pm, vm_page_t m) * an entire address space. Only works for the current pmap. */ void -pmap_remove_pages(pmap_t pm, vm_offset_t sva, vm_offset_t eva) +pmap_remove_pages(pmap_t pm) { } diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index d41011301f25..2bddd7b1655a 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -121,7 +121,7 @@ void pmap_qremove(vm_offset_t, int); void pmap_release(pmap_t); void pmap_remove(pmap_t, vm_offset_t, vm_offset_t); void pmap_remove_all(vm_page_t m); -void pmap_remove_pages(pmap_t, vm_offset_t, vm_offset_t); +void pmap_remove_pages(pmap_t); void pmap_zero_page(vm_page_t); void pmap_zero_page_area(vm_page_t, int off, int size); void pmap_zero_page_idle(vm_page_t);