svn commit: r187520 - in stable/7/sys: . amd64/amd64 contrib/pf dev/ath/ath_hal dev/cxgb

[Alan Cox]

Author: alc
Date: Wed Jan 21 06:32:32 2009
New Revision: 187520
URL: http://svn.freebsd.org/changeset/base/187520

Log:
  MFC rev 177851
    Optimize pmap_pml4e() and pmap_pdpe() based upon two observations: The
    given pmap is never NULL, and therefore pmap_pml4e() can never return
    NULL.  The pervasive use of these inline functions throughout the pmap
    makes these simple changes worthwhile.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/amd64/pmap.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/amd64/amd64/pmap.c
==============================================================================
--- stable/7/sys/amd64/amd64/pmap.c	Wed Jan 21 06:30:53 2009	(r187519)
+++ stable/7/sys/amd64/amd64/pmap.c	Wed Jan 21 06:32:32 2009	(r187520)
@@ -290,8 +290,6 @@ static __inline pml4_entry_t *
 pmap_pml4e(pmap_t pmap, vm_offset_t va)
 {
 
-	if (!pmap)
-		return NULL;
 	return (&pmap->pm_pml4[pmap_pml4e_index(va)]);
 }
 
@@ -312,7 +310,7 @@ pmap_pdpe(pmap_t pmap, vm_offset_t va)
 	pml4_entry_t *pml4e;
 
 	pml4e = pmap_pml4e(pmap, va);
-	if (pml4e == NULL || (*pml4e & PG_V) == 0)
+	if ((*pml4e & PG_V) == 0)
 		return NULL;
 	return (pmap_pml4e_to_pdpe(pml4e, va));
 }