svn commit: r208688 - head/sys/arm/arm

Alan Cox alc at FreeBSD.org
Tue Jun 1 05:33:00 UTC 2010


Author: alc
Date: Tue Jun  1 05:32:59 2010
New Revision: 208688
URL: http://svn.freebsd.org/changeset/base/208688

Log:
  In pmap_enter_locked(), don't require the vector page to be VPO_BUSY.

Modified:
  head/sys/arm/arm/pmap.c

Modified: head/sys/arm/arm/pmap.c
==============================================================================
--- head/sys/arm/arm/pmap.c	Tue Jun  1 05:18:48 2010	(r208687)
+++ head/sys/arm/arm/pmap.c	Tue Jun  1 05:32:59 2010	(r208688)
@@ -3318,15 +3318,16 @@ pmap_enter_locked(pmap_t pmap, vm_offset
 	u_int oflags;
 	vm_paddr_t pa;
 
-	KASSERT((m->oflags & VPO_BUSY) != 0 || (flags & M_NOWAIT) != 0,
-	    ("pmap_enter_locked: page %p is not busy", m));
 	PMAP_ASSERT_LOCKED(pmap);
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	if (va == vector_page) {
 		pa = systempage.pv_pa;
 		m = NULL;
-	} else
+	} else {
+		KASSERT((m->oflags & VPO_BUSY) != 0 || (flags & M_NOWAIT) != 0,
+		    ("pmap_enter_locked: page %p is not busy", m));
 		pa = VM_PAGE_TO_PHYS(m);
+	}
 	nflags = 0;
 	if (prot & VM_PROT_WRITE)
 		nflags |= PVF_WRITE;


More information about the svn-src-all mailing list