diff options
author | alc <alc@FreeBSD.org> | 2012-08-10 05:00:50 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2012-08-10 05:00:50 +0000 |
commit | 57023066b874c97e8483f6189c06adffc03fd456 (patch) | |
tree | b881ec3c6f383d9603ec9fa44916d57e46e1e470 | |
parent | 804597f72dded91143fd97d8e9935be029fcf8cc (diff) | |
download | FreeBSD-src-57023066b874c97e8483f6189c06adffc03fd456.zip FreeBSD-src-57023066b874c97e8483f6189c06adffc03fd456.tar.gz |
Merge r134393 from amd64/i386:
The machine-independent parts of the virtual memory system always pass a
valid pmap to the pmap functions that require one. Remove the checks for
NULL. (These checks have their origins in the Mach pmap.c that was
integrated into BSD. None of the new code written specifically for
FreeBSD included them.)
-rw-r--r-- | sys/mips/mips/pmap.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/mips/mips/pmap.c b/sys/mips/mips/pmap.c index d1e6cde..bd0e76f 100644 --- a/sys/mips/mips/pmap.c +++ b/sys/mips/mips/pmap.c @@ -1588,9 +1588,6 @@ pmap_remove(struct pmap *pmap, vm_offset_t sva, vm_offset_t eva) pd_entry_t *pde, *pdpe; pt_entry_t *pte; - if (pmap == NULL) - return; - if (pmap->pm_stats.resident_count == 0) return; @@ -1721,9 +1718,6 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) pd_entry_t *pde, *pdpe; vm_offset_t va_next; - if (pmap == NULL) - return; - if ((prot & VM_PROT_READ) == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); return; @@ -1806,9 +1800,6 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, vm_page_t mpte, om; pt_entry_t rw = 0; - if (pmap == NULL) - return; - va &= ~PAGE_MASK; KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); KASSERT((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) != 0, @@ -2251,9 +2242,6 @@ pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired) { pt_entry_t *pte; - if (pmap == NULL) - return; - PMAP_LOCK(pmap); pte = pmap_pte(pmap, va); |