svn commit: r226634 - projects/armv6/sys/arm/arm

[Olivier Houchard]

Author: cognet
Date: Sat Oct 22 16:03:45 2011
New Revision: 226634
URL: http://svn.freebsd.org/changeset/base/226634

Log:
  Catchup with the vm_page flags changes

Modified:
  projects/armv6/sys/arm/arm/pmap-v6.c

Modified: projects/armv6/sys/arm/arm/pmap-v6.c
==============================================================================
--- projects/armv6/sys/arm/arm/pmap-v6.c	Sat Oct 22 14:08:43 2011	(r226633)
+++ projects/armv6/sys/arm/arm/pmap-v6.c	Sat Oct 22 16:03:45 2011	(r226634)
@@ -902,7 +902,7 @@ pmap_clearbit(struct vm_page *pg, u_int 
 	}
 
 	if (maskbits & PVF_WRITE)
-		vm_page_flag_clear(pg, PG_WRITEABLE);
+		vm_page_aflag_clear(pg, PGA_WRITEABLE);
 	vm_page_unlock_queues();
 	return (count);
 }
@@ -942,7 +942,7 @@ pmap_enter_pv(struct vm_page *pg, struct
 	pg->md.pvh_attrs |= flags & (PVF_REF | PVF_MOD);
 	if (pve->pv_flags & PVF_WIRED)
 		++pm->pm_stats.wired_count;
-	vm_page_flag_set(pg, PG_REFERENCED);
+	vm_page_aflag_set(pg, PGA_REFERENCED);
 }
 
 /*
@@ -1032,7 +1032,7 @@ pmap_nuke_pv(struct vm_page *pg, pmap_t 
 	if (TAILQ_FIRST(&pg->md.pv_list) == NULL)
 		pg->md.pvh_attrs &= ~PVF_REF;
 	else
-		vm_page_flag_set(pg, PG_REFERENCED);
+		vm_page_aflag_set(pg, PGA_REFERENCED);
 
 	if (pve->pv_flags & PVF_WRITE) {
 		TAILQ_FOREACH(pve, &pg->md.pv_list, pv_list)
@@ -1040,7 +1040,7 @@ pmap_nuke_pv(struct vm_page *pg, pmap_t 
 			    break;
 		if (!pve) {
 			pg->md.pvh_attrs &= ~PVF_MOD;
-			vm_page_flag_clear(pg, PG_WRITEABLE);
+			vm_page_aflag_clear(pg, PGA_WRITEABLE);
 		}
 	}
 }
@@ -1942,7 +1942,7 @@ pmap_remove_pages(pmap_t pmap)
 		npv = TAILQ_NEXT(pv, pv_plist);
 		pmap_nuke_pv(m, pmap, pv);
 		if (TAILQ_EMPTY(&m->md.pv_list))
-			vm_page_flag_clear(m, PG_WRITEABLE);
+			vm_page_aflag_clear(m, PGA_WRITEABLE);
 		pmap_free_pv_entry(pv);
 		pmap_free_l2_bucket(pmap, l2b, 1);
 	}
@@ -2327,7 +2327,7 @@ pmap_remove_all(vm_page_t m)
 		else
 			cpu_tlb_flushD();
 	}
-	vm_page_flag_clear(m, PG_WRITEABLE);
+	vm_page_aflag_clear(m, PGA_WRITEABLE);
 	vm_page_unlock_queues();
 }
 
@@ -2615,7 +2615,7 @@ do_l2b_alloc:
 				vm_page_dirty(m);
 		}
 		if (m && opte)
-			vm_page_flag_set(m, PG_REFERENCED);
+			vm_page_aflag_set(m, PGA_REFERENCED);
 	} else {
 		/*
 		 * Need to do page referenced emulation.
@@ -2630,7 +2630,7 @@ do_l2b_alloc:
 
 		if (m != NULL &&
 		    (m->oflags & VPO_UNMANAGED) == 0)
-			vm_page_flag_set(m, PG_WRITEABLE);
+			vm_page_aflag_set(m, PGA_WRITEABLE);
 	}
 
 	if (user)
@@ -3382,11 +3382,11 @@ pmap_clear_modify(vm_page_t m)
 	    ("pmap_clear_modify: page %p is busy", m));
 
 	/*
-	 * If the page is not PG_WRITEABLE, then no mappings can be modified.
+	 * If the page is not PGA_WRITEABLE, then no mappings can be modified.
 	 * If the object containing the page is locked and the page is not
-	 * VPO_BUSY, then PG_WRITEABLE cannot be concurrently set.
+	 * VPO_BUSY, then PGA_WRITEABLE cannot be concurrently set.
 	 */
-	if ((m->flags & PG_WRITEABLE) == 0)
+	if ((m->flags & PGA_WRITEABLE) == 0)
 		return;
 
 	if (m->md.pvh_attrs & PVF_MOD)
@@ -3420,13 +3420,13 @@ pmap_remove_write(vm_page_t m)
 	    ("pmap_remove_write: page %p is not managed", m));
 
 	/*
-	 * If the page is not VPO_BUSY, then PG_WRITEABLE cannot be set by
-	 * another thread while the object is locked.  Thus, if PG_WRITEABLE
+	 * If the page is not VPO_BUSY, then PGA_WRITEABLE cannot be set by
+	 * another thread while the object is locked.  Thus, if PGA_WRITEABLE
 	 * is clear, no page table entries need updating.
 	 */
 	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if ((m->oflags & VPO_BUSY) != 0 ||
-	    (m->flags & PG_WRITEABLE) != 0)
+	    (m->flags & PGA_WRITEABLE) != 0)
 		pmap_clearbit(m, PVF_WRITE);
 }