From owner-svn-src-projects@FreeBSD.ORG Thu Sep 19 16:22:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7020ED6D; Thu, 19 Sep 2013 16:22:06 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5D6FE293F; Thu, 19 Sep 2013 16:22:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8JGM6T2076375; Thu, 19 Sep 2013 16:22:06 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8JGM6qF076374; Thu, 19 Sep 2013 16:22:06 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201309191622.r8JGM6qF076374@svn.freebsd.org> From: Neel Natu Date: Thu, 19 Sep 2013 16:22:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255706 - projects/bhyve_npt_pmap/sys/amd64/amd64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Sep 2013 16:22:06 -0000 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);