PERFORCE change 136479 for review

[Kip Macy]

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

Change 136479 by kmacy at 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;
 	}