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.)
This commit is contained in:
parent
9776cb63ad
commit
c0c5f0df71
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=239170
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user