From owner-p4-projects@FreeBSD.ORG  Thu Jan 17 06:38:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 66ADA16A41A; Thu, 17 Jan 2008 06:38:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2C41E16A418
	for <perforce@freebsd.org>; Thu, 17 Jan 2008 06:38:42 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D7D413C4D1
	for <perforce@freebsd.org>; Thu, 17 Jan 2008 06:38:42 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0H6cfpR061780
	for <perforce@freebsd.org>; Thu, 17 Jan 2008 06:38:41 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H6cfZ5061777
	for perforce@freebsd.org; Thu, 17 Jan 2008 06:38:41 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 17 Jan 2008 06:38:41 GMT
Message-Id: <200801170638.m0H6cfZ5061777@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133460 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jan 2008 06:38:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=133460

Change 133460 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 06:37:47

	fix pmap_release to release the pdpt rather than releasing 
	the first page in the pdir twice

Affected files ...

.. //depot/projects/xen31/sys/i386/xen/pmap.c#21 edit

Differences ...

==== //depot/projects/xen31/sys/i386/xen/pmap.c#21 (text+ko) ====

@@ -1692,7 +1692,12 @@
 {
 	vm_page_t m, ptdpg[NPGPTD+1];
 	vm_paddr_t ma;
-	int i, npgptd = NPGPTD + 1;
+	int i;
+#ifdef PAE	
+	int npgptd = NPGPTD + 1;
+#else
+	int npgptd = NPGPTD;
+#endif
 
 	KASSERT(pmap->pm_stats.resident_count == 0,
 	    ("pmap_release: pmap resident count %ld != 0",
@@ -1705,8 +1710,10 @@
 
 	for (i = 0; i < NPGPTD; i++)
 		ptdpg[i] = PHYS_TO_VM_PAGE(PT_GET(&pmap->pm_pdir[PTDPTDI + i]) & PG_FRAME);
-
-	ptdpg[NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdir));
+	
+#ifdef PAE
+	ptdpg[NPGPTD] = PHYS_TO_VM_PAGE(vtophys(pmap->pm_pdpt));
+#endif	
 	for (i = 0; i < nkpt + NPGPTD; i++) 
 		PD_CLEAR_VA(pmap, PTDPTDI + i, FALSE);