svn commit: r255503 - head/sys/powerpc/aim

[Nathan Whitehorn]

Author: nwhitehorn
Date: Fri Sep 13 01:12:45 2013
New Revision: 255503
URL: http://svnweb.freebsd.org/changeset/base/255503

Log:
  Change VM object lock assertion to match locking higher in the call
  chain. This repairs a panic observed during pageout on some 64-bit
  PowerPC systems.
  
  Submitted by:	grehan
  Approved by:	re (kib)
  MFC after:	2 weeks
  Revisit after:	10.0

Modified:
  head/sys/powerpc/aim/mmu_oea64.c

Modified: head/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.c	Fri Sep 13 00:51:37 2013	(r255502)
+++ head/sys/powerpc/aim/mmu_oea64.c	Fri Sep 13 01:12:45 2013	(r255503)
@@ -1523,7 +1523,7 @@ moea64_is_modified(mmu_t mmu, vm_page_t 
 	 * concurrently set while the object is locked.  Thus, if PGA_WRITEABLE
 	 * is clear, no PTEs can have LPTE_CHG set.
 	 */
-	VM_OBJECT_ASSERT_WLOCKED(m->object);
+	VM_OBJECT_ASSERT_LOCKED(m->object);
 	if (!vm_page_xbusied(m) && (m->aflags & PGA_WRITEABLE) == 0)
 		return (FALSE);
 	return (moea64_query_bit(mmu, m, LPTE_CHG));