svn commit: r270835 - stable/10/sys/ia64/ia64

[Alan Cox]

Author: alc
Date: Sat Aug 30 03:41:47 2014
New Revision: 270835
URL: http://svnweb.freebsd.org/changeset/base/270835

Log:
  Update an assertion to reflect the changes made in r270439.  This is a
  direct commit to stable/10 because ia64 is no longer supported by HEAD.
  
  Reported by:	marcel
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  stable/10/sys/ia64/ia64/pmap.c

Modified: stable/10/sys/ia64/ia64/pmap.c
==============================================================================
--- stable/10/sys/ia64/ia64/pmap.c	Sat Aug 30 03:10:55 2014	(r270834)
+++ stable/10/sys/ia64/ia64/pmap.c	Sat Aug 30 03:41:47 2014	(r270835)
@@ -1713,8 +1713,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, 
 
 	va &= ~PAGE_MASK;
  	KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig"));
-	KASSERT((m->oflags & VPO_UNMANAGED) != 0 || vm_page_xbusied(m),
-	    ("pmap_enter: page %p is not busy", m));
+	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
+		VM_OBJECT_ASSERT_LOCKED(m->object);
 
 	/*
 	 * Find (or create) a pte for the given mapping.