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.)

1 files changed, 0 insertions, 16 deletions

diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 515dbb3..26861a2 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -747,8 +747,6 @@ pmap_extract(pmap_t pmap, vm_offset_t va)
 	vm_paddr_t pa;
 
 	pa = 0;
-	if (pmap == NULL)
-		return (pa);
 	PMAP_LOCK(pmap);
 	pte = pmap_lev3pte(pmap, va);
 	if (pte != NULL && pmap_pte_v(pte))
@@ -771,8 +769,6 @@ pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
 	vm_page_t m;
 
 	m = NULL;
-	if (pmap == NULL)
-		return (m);
 	vm_page_lock_queues();
 	PMAP_LOCK(pmap);
 	pte = pmap_lev3pte(pmap, va);
@@ -1468,9 +1464,6 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
 	vm_offset_t va, nva;
 
-	if (pmap == NULL)
-		return;
-
 	/*
 	 * Perform an unsynchronized read.  This is, however, safe.
 	 */
@@ -1586,9 +1579,6 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
 	pt_entry_t* pte;
 	int newprot;
 
-	if (pmap == NULL)
-		return;
-
 	if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
 		pmap_remove(pmap, sva, eva);
 		return;
@@ -1681,9 +1671,6 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 	vm_page_t mpte;
 	int managed;
 
-	if (pmap == NULL)
-		return;
-
 	va &= ~PAGE_MASK;
 #ifdef PMAP_DIAGNOSTIC
 	if (va > VM_MAX_KERNEL_ADDRESS)
@@ -1965,9 +1952,6 @@ pmap_change_wiring(pmap, va, wired)
 {
 	pt_entry_t *pte;
 
-	if (pmap == NULL)
-		return;
-
 	PMAP_LOCK(pmap);
 	pte = pmap_lev3pte(pmap, va);