From owner-p4-projects@FreeBSD.ORG  Fri Feb 29 19:48:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A81C1065CDA; Fri, 29 Feb 2008 19:48:21 +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 A91491065AC7
	for <perforce@freebsd.org>; Fri, 29 Feb 2008 19:48:19 +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 314B18FC34
	for <perforce@freebsd.org>; Fri, 29 Feb 2008 19:48:19 +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 m1TJmJtS092621
	for <perforce@freebsd.org>; Fri, 29 Feb 2008 19:48:19 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmJNE092619
	for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:19 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 29 Feb 2008 19:48:19 GMT
Message-Id: <200802291948.m1TJmJNE092619@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 136479 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: Fri, 29 Feb 2008 19:48:23 -0000

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

Change 136479 by kmacy@pandemonium:kmacy:xen31 on 2008/02/29 05:46:16

	remove some more wrpt vestiges

Affected files ...

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

Differences ...

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

@@ -3701,7 +3701,7 @@
 			PMAP_LOCK(pmap);
 			pte = pmap_pte_quick(pmap, pv->pv_va);
 			if ((*pte & PG_A) != 0) {
-				atomic_clear_int((u_int *)pte, PG_A);
+				PT_SET_VA_MA(pte, *pte & ~PG_A, FALSE);
 				pmap_invalidate_page(pmap, pv->pv_va);
 				rtval++;
 				if (rtval > 4)
@@ -3776,7 +3776,7 @@
 			 * in size, PG_A is among the least significant
 			 * 32 bits. 
 			 */
-			atomic_clear_int((u_int *)pte, PG_A);
+			PT_SET_VA_MA(pte, *pte & ~PG_A, FALSE);
 			pmap_invalidate_page(pmap, pv->pv_va);
 		}
 		PMAP_UNLOCK(pmap);
@@ -3899,8 +3899,8 @@
 			opte = *(u_int *)pte;
 			npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT);
 			npte |= pmap_cache_bits(mode, 0);
-		} while (npte != opte &&
-		    !atomic_cmpset_int((u_int *)pte, opte, npte));
+			PT_SET_VA_MA(pte, npte, TRUE);
+		} while (npte != opte && (*pte != npte));
 		tmpva += PAGE_SIZE;
 		size -= PAGE_SIZE;
 	}