Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 19 Sep 2013 16:22:06 +0000 (UTC)
From:      Neel Natu <neel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r255706 - projects/bhyve_npt_pmap/sys/amd64/amd64
Message-ID:  <201309191622.r8JGM6qF076374@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: neel
Date: Thu Sep 19 16:22:05 2013
New Revision: 255706
URL: http://svnweb.freebsd.org/changeset/base/255706

Log:
  Fold in check for 'pg_ps_enabled' under 'pmap_ps_enabled()'.
  
  Requested by:	kib@
  Discussed with:	alc@

Modified:
  projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c

Modified: projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c
==============================================================================
--- projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c	Thu Sep 19 14:41:10 2013	(r255705)
+++ projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c	Thu Sep 19 16:22:05 2013	(r255706)
@@ -1113,7 +1113,7 @@ static __inline boolean_t
 pmap_ps_enabled(pmap_t pmap)
 {
 
-	return ((pmap->pm_flags & PMAP_PDE_SUPERPAGE) != 0);
+	return (pg_ps_enabled && (pmap->pm_flags & PMAP_PDE_SUPERPAGE) != 0);
 }
 
 static void
@@ -4297,7 +4297,7 @@ unchanged:
 	 * populated, then attempt promotion.
 	 */
 	if ((mpte == NULL || mpte->wire_count == NPTEPG) &&
-	    pg_ps_enabled && pmap_ps_enabled(pmap) &&
+	    pmap_ps_enabled(pmap) &&
 	    (m->flags & PG_FICTITIOUS) == 0 &&
 	    vm_reserv_level_iffullpop(m) == 0)
 		pmap_promote_pde(pmap, pde, va, &lock);
@@ -4422,7 +4422,7 @@ pmap_enter_object(pmap_t pmap, vm_offset
 		va = start + ptoa(diff);
 		if ((va & PDRMASK) == 0 && va + NBPDR <= end &&
 		    (VM_PAGE_TO_PHYS(m) & PDRMASK) == 0 &&
-		    pg_ps_enabled && pmap_ps_enabled(pmap) &&
+		    pmap_ps_enabled(pmap) &&
 		    vm_reserv_level_iffullpop(m) == 0 &&
 		    pmap_enter_pde(pmap, va, m, prot, &lock))
 			m = &m[NBPDR / PAGE_SIZE - 1];
@@ -6647,7 +6647,7 @@ pmap_emulate_dirty(pmap_t pmap, vm_offse
 			m = PHYS_TO_VM_PAGE(*pte & PG_FRAME);
 
 			if ((mpte == NULL || mpte->wire_count == NPTEPG) &&
-			    pg_ps_enabled && pmap_ps_enabled(pmap) &&
+			    pmap_ps_enabled(pmap) &&
 			    (m->flags & PG_FICTITIOUS) == 0 &&
 			    vm_reserv_level_iffullpop(m) == 0)
 				pmap_promote_pde(pmap, pde, va, &lock);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309191622.r8JGM6qF076374>