From owner-svn-src-projects@FreeBSD.ORG  Sat Jul  6 06:24:20 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E4700EB;
 Sat,  6 Jul 2013 06:24:20 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D77621A8E;
 Sat,  6 Jul 2013 06:24:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r666OKi6047269;
 Sat, 6 Jul 2013 06:24:20 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r666OK4P047268;
 Sat, 6 Jul 2013 06:24:20 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201307060624.r666OK4P047268@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 6 Jul 2013 06:24:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r252865 - 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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Jul 2013 06:24:21 -0000

Author: neel
Date: Sat Jul  6 06:24:19 2013
New Revision: 252865
URL: http://svnweb.freebsd.org/changeset/base/252865

Log:
  Since 'pm_pml4' is always a direct mapped address use DMAP_TO_PHYS() to get
  the physical address instead of getting it from recursive page table index.
  
  This allows 'pmap_release()' to work with pmaps that may not have the
  recursive page table index populated (e.g. PT_EPT).

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	Sat Jul  6 04:46:42 2013	(r252864)
+++ projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c	Sat Jul  6 06:24:19 2013	(r252865)
@@ -2273,7 +2273,7 @@ pmap_release(pmap_t pmap)
 	KASSERT(vm_radix_is_empty(&pmap->pm_root),
 	    ("pmap_release: pmap has reserved page table page(s)"));
 
-	m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I] & PG_FRAME);
+	m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pmap->pm_pml4));
 
 	pmap->pm_pml4[KPML4I] = 0;	/* KVA */
 	for (i = 0; i < NDMPML4E; i++)	/* Direct Map */