svn commit: r204026 - projects/ppc64/sys/powerpc/aim

[Nathan Whitehorn]

Author: nwhitehorn
Date: Thu Feb 18 02:37:23 2010
New Revision: 204026
URL: http://svn.freebsd.org/changeset/base/204026

Log:
  Fix a data corruption bug during swap. This bug also exists on 32-bit OEA,
  and should be applied there after some soaking and correctness checks.
  
  Discussed with:	grehan

Modified:
  projects/ppc64/sys/powerpc/aim/mmu_oea64.c

Modified: projects/ppc64/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Thu Feb 18 02:06:57 2010	(r204025)
+++ projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Thu Feb 18 02:37:23 2010	(r204026)
@@ -2054,6 +2054,10 @@ moea64_remove_all(mmu_t mmu, vm_page_t m
 		moea64_pvo_remove(pvo, -1);
 		PMAP_UNLOCK(pmap);
 	}
+	if ((m->flags & PG_WRITEABLE) && moea64_is_modified(mmu, m)) {
+		moea64_attr_clear(m, LPTE_CHG);
+		vm_page_dirty(m);
+	}
 	vm_page_flag_clear(m, PG_WRITEABLE);
 }
 
@@ -2472,10 +2476,8 @@ moea64_query_bit(vm_page_t m, u_int64_t 
 	struct	pvo_entry *pvo;
 	struct	lpte *pt;
 
-#if 0
 	if (moea64_attr_fetch(m) & ptebit)
 		return (TRUE);
-#endif
 
 	LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) {
 		MOEA_PVO_CHECK(pvo);	/* sanity check */