Index: sys/sparc64/sparc64/pmap.c
===================================================================
--- sys/sparc64/sparc64/pmap.c	(revision 250856)
+++ sys/sparc64/sparc64/pmap.c	(working copy)
@@ -1632,6 +1632,8 @@ pmap_enter_object(pmap_t pm, vm_offset_t start, vm
 	vm_page_t m;
 	vm_pindex_t diff, psize;
 
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	m = m_start;
 	rw_wlock(&tte_list_global_lock);
Index: sys/ia64/ia64/pmap.c
===================================================================
--- sys/ia64/ia64/pmap.c	(revision 250856)
+++ sys/ia64/ia64/pmap.c	(working copy)
@@ -1802,7 +1802,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start,
 	vm_page_t m;
 	vm_pindex_t diff, psize;
 
-	VM_OBJECT_ASSERT_WLOCKED(m_start->object);
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	m = m_start;
 	rw_wlock(&pvh_global_lock);
Index: sys/vm/vm_map.c
===================================================================
--- sys/vm/vm_map.c	(revision 250856)
+++ sys/vm/vm_map.c	(working copy)
@@ -1806,18 +1806,29 @@ vm_map_pmap_enter(vm_map_t map, vm_offset_t addr,
 
 	if ((prot & (VM_PROT_READ | VM_PROT_EXECUTE)) == 0 || object == NULL)
 		return;
-	VM_OBJECT_WLOCK(object);
+relock:
+	VM_OBJECT_RLOCK(object);
 	if (object->type == OBJT_DEVICE || object->type == OBJT_SG) {
-		pmap_object_init_pt(map->pmap, addr, object, pindex, size);
-		goto unlock_return;
+		VM_OBJECT_RUNLOCK(object);
+		VM_OBJECT_WLOCK(object);
+		if (object->type == OBJT_DEVICE || object->type == OBJT_SG) {
+			pmap_object_init_pt(map->pmap, addr, object, pindex,
+			    size);
+			VM_OBJECT_WUNLOCK(object);
+			return;
+		}
+		VM_OBJECT_WUNLOCK(object);
+		goto relock;
 	}
 
 	psize = atop(size);
 	if (psize > MAX_INIT_PT && (flags & MAP_PREFAULT_PARTIAL) != 0)
 		psize = MAX_INIT_PT;
 	if (psize + pindex > object->size) {
-		if (object->size < pindex)
-			goto unlock_return;
+		if (object->size < pindex) {
+			VM_OBJECT_RUNLOCK(object);
+			return;
+		}
 		psize = object->size - pindex;
 	}
 
@@ -1856,8 +1867,7 @@ vm_map_pmap_enter(vm_map_t map, vm_offset_t addr,
 	if (p_start != NULL)
 		pmap_enter_object(map->pmap, start, addr + ptoa(psize),
 		    p_start, prot);
-unlock_return:
-	VM_OBJECT_WUNLOCK(object);
+	VM_OBJECT_RUNLOCK(object);
 }
 
 /*
Index: sys/vm/vm_page.c
===================================================================
--- sys/vm/vm_page.c	(revision 250856)
+++ sys/vm/vm_page.c	(working copy)
@@ -959,7 +959,7 @@ vm_page_find_least(vm_object_t object, vm_pindex_t
 {
 	vm_page_t m;
 
-	VM_OBJECT_ASSERT_WLOCKED(object);
+	VM_OBJECT_ASSERT_LOCKED(object);
 	if ((m = TAILQ_FIRST(&object->memq)) != NULL && m->pindex < pindex)
 		m = vm_radix_lookup_ge(&object->rtree, pindex);
 	return (m);
Index: sys/i386/i386/pmap.c
===================================================================
--- sys/i386/i386/pmap.c	(revision 250856)
+++ sys/i386/i386/pmap.c	(working copy)
@@ -3677,7 +3677,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start,
 	vm_page_t m, mpte;
 	vm_pindex_t diff, psize;
 
-	VM_OBJECT_ASSERT_WLOCKED(m_start->object);
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	mpte = NULL;
 	m = m_start;
Index: sys/i386/xen/pmap.c
===================================================================
--- sys/i386/xen/pmap.c	(revision 250856)
+++ sys/i386/xen/pmap.c	(working copy)
@@ -2871,7 +2871,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start,
 	multicall_entry_t *mclp = mcl;
 	int error, count = 0;
 
-	VM_OBJECT_ASSERT_WLOCKED(m_start->object);
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	mpte = NULL;
 	m = m_start;
Index: sys/amd64/amd64/pmap.c
===================================================================
--- sys/amd64/amd64/pmap.c	(revision 250856)
+++ sys/amd64/amd64/pmap.c	(working copy)
@@ -3722,7 +3722,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start,
 	vm_page_t m, mpte;
 	vm_pindex_t diff, psize;
 
-	VM_OBJECT_ASSERT_WLOCKED(m_start->object);
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	mpte = NULL;
 	m = m_start;
Index: sys/powerpc/booke/pmap.c
===================================================================
--- sys/powerpc/booke/pmap.c	(revision 250856)
+++ sys/powerpc/booke/pmap.c	(working copy)
@@ -1716,6 +1716,8 @@ mmu_booke_enter_object(mmu_t mmu, pmap_t pmap, vm_
 	vm_page_t m;
 	vm_pindex_t diff, psize;
 
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	m = m_start;
 	rw_wlock(&pvh_global_lock);
Index: sys/powerpc/aim/mmu_oea.c
===================================================================
--- sys/powerpc/aim/mmu_oea.c	(revision 250856)
+++ sys/powerpc/aim/mmu_oea.c	(working copy)
@@ -1217,6 +1217,8 @@ moea_enter_object(mmu_t mmu, pmap_t pm, vm_offset_
 	vm_page_t m;
 	vm_pindex_t diff, psize;
 
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	m = m_start;
 	rw_wlock(&pvh_global_lock);
Index: sys/powerpc/aim/mmu_oea64.c
===================================================================
--- sys/powerpc/aim/mmu_oea64.c	(revision 250856)
+++ sys/powerpc/aim/mmu_oea64.c	(working copy)
@@ -1360,6 +1360,8 @@ moea64_enter_object(mmu_t mmu, pmap_t pm, vm_offse
 	vm_page_t m;
 	vm_pindex_t diff, psize;
 
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	m = m_start;
 	while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
Index: sys/arm/arm/pmap-v6.c
===================================================================
--- sys/arm/arm/pmap-v6.c	(revision 250856)
+++ sys/arm/arm/pmap-v6.c	(working copy)
@@ -2931,6 +2931,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start,
 	vm_page_t m;
 	vm_pindex_t diff, psize;
 
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	m = m_start;
 	rw_wlock(&pvh_global_lock);
Index: sys/arm/arm/pmap.c
===================================================================
--- sys/arm/arm/pmap.c	(revision 250856)
+++ sys/arm/arm/pmap.c	(working copy)
@@ -3587,6 +3587,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start,
 	vm_page_t m;
 	vm_pindex_t diff, psize;
 
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	m = m_start;
 	rw_wlock(&pvh_global_lock);
Index: sys/mips/mips/pmap.c
===================================================================
--- sys/mips/mips/pmap.c	(revision 250856)
+++ sys/mips/mips/pmap.c	(working copy)
@@ -2399,7 +2399,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start,
 	vm_page_t m, mpte;
 	vm_pindex_t diff, psize;
 
-	VM_OBJECT_ASSERT_WLOCKED(m_start->object);
+	VM_OBJECT_ASSERT_LOCKED(m_start->object);
+
 	psize = atop(end - start);
 	mpte = NULL;
 	m = m_start;