From owner-p4-projects@FreeBSD.ORG  Thu Jan 17 04:24:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CFE6C16A468; Thu, 17 Jan 2008 04:24:20 +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 940A016A420
	for <perforce@freebsd.org>; Thu, 17 Jan 2008 04:24:20 +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 8807C13C447
	for <perforce@freebsd.org>; Thu, 17 Jan 2008 04:24:20 +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 m0H4OKDp012452
	for <perforce@freebsd.org>; Thu, 17 Jan 2008 04:24:20 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0H4OKhb012449
	for perforce@freebsd.org; Thu, 17 Jan 2008 04:24:20 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 17 Jan 2008 04:24:20 GMT
Message-Id: <200801170424.m0H4OKhb012449@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 133451 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 04:24:21 -0000

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

Change 133451 by kmacy@pandemonium:kmacy:xen31 on 2008/01/17 04:23:48

	clear PMAP2 while holding the PMAP2mutex

Affected files ...

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

Differences ...

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

@@ -950,8 +950,10 @@
 pmap_pte_release(pt_entry_t *pte)
 {
 
-	if ((pt_entry_t *)((vm_offset_t)pte & ~PAGE_MASK) == PADDR2)
+	if ((pt_entry_t *)((vm_offset_t)pte & ~PAGE_MASK) == PADDR2) {
+		*PMAP2 = 0;
 		mtx_unlock(&PMAP2mutex);
+	}
 }
 
 static __inline void
@@ -1034,9 +1036,6 @@
 		pte = pmap_pte(pmap, va);
 		rtval = (PT_GET(pte) & PG_FRAME) | (va & PAGE_MASK);
 		pmap_pte_release(pte);
-
-		if (*PMAP2)
-			*PMAP2 = 0;
 	}
 	PMAP_UNLOCK(pmap);
 	return (rtval);
@@ -1066,10 +1065,6 @@
 		pte = pmap_pte(pmap, va);
 		rtval = (*pte & PG_FRAME) | (va & PAGE_MASK);
 		pmap_pte_release(pte);
-#ifdef XEN
-		if (*PMAP2)
-			*PMAP2 = 0;
-#endif
 	}
 	PMAP_UNLOCK(pmap);
 	return (rtval);
@@ -2941,8 +2936,6 @@
 	 */
 	pmap_pte_set_w(pte, wired);
 	pmap_pte_release(pte);
-	if (*PMAP2)
-		*PMAP2 = 0;
 	PMAP_UNLOCK(pmap);
 }
 
@@ -3444,8 +3437,6 @@
 		pmap_pte_release(pte);
 	}
 	PT_UPDATES_FLUSH();
-	if (*PMAP2)
-		*PMAP2 = 0;
 }
 
 void
@@ -3460,8 +3451,6 @@
 		pmap_pte_release(pte);
 	}
 	PT_UPDATES_FLUSH();
-	if (*PMAP2)
-		*PMAP2 = 0;
 }
 
 /*
@@ -3779,8 +3768,6 @@
 	pte = (ptep != NULL) ? PT_GET(ptep) : 0;
 	pmap_pte_release(ptep);
 	PMAP_UNLOCK(pmap);
-	if (*PMAP2)
-		*PMAP2 = 0;
 	if (pte != 0) {
 		vm_paddr_t pa;