Index: sys/vm/vm_map.c
===================================================================
--- sys/vm/vm_map.c
+++ sys/vm/vm_map.c
@@ -739,10 +739,10 @@
 SYSCTL_INT(_debug, OID_AUTO, vmmap_check, CTLFLAG_RWTUN,
     &enable_vmmap_check, 0, "Enable vm map consistency checking");
 
-static void _vm_map_assert_consistent(vm_map_t map);
+static void _vm_map_assert_consistent(vm_map_t map, vm_map_entry_t entry);
 
-#define VM_MAP_ASSERT_CONSISTENT(map) \
-    _vm_map_assert_consistent(map)
+#define VM_MAP_ASSERT_CONSISTENT(map, entry) \
+    _vm_map_assert_consistent(map, entry)
 #else
 #define	VM_MAP_ASSERT_LOCKED(map)
 #define VM_MAP_ASSERT_CONSISTENT(map)
@@ -1180,7 +1180,7 @@
 		return (NULL);
 	}
 	vm_map_splay_merge(map, root, llist, rlist);
-	VM_MAP_ASSERT_CONSISTENT(map);
+	VM_MAP_ASSERT_CONSISTENT(map, root);
 	return (root);
 }
 
@@ -1207,7 +1207,7 @@
 	llist->next = rlist->prev = entry;
 	entry->left = entry->right = NULL;
 	vm_map_splay_merge(map, entry, llist, rlist);
-	VM_MAP_ASSERT_CONSISTENT(map);
+	VM_MAP_ASSERT_CONSISTENT(map, entry);
 }
 
 enum unlink_merge_type {
@@ -1257,7 +1257,7 @@
 		vm_map_splay_merge(map, root, llist, rlist);
 	else
 		map->root = NULL;
-	VM_MAP_ASSERT_CONSISTENT(map);
+	VM_MAP_ASSERT_CONSISTENT(map, root);
 	map->nentries--;
 	CTR3(KTR_VM, "vm_map_entry_unlink: map %p, nentries %d, entry %p", map,
 	    map->nentries, entry);
@@ -1284,7 +1284,7 @@
 	root->right = NULL;
 	entry->end += grow_amount;
 	vm_map_splay_merge(map, root, llist, rlist);
-	VM_MAP_ASSERT_CONSISTENT(map);
+	VM_MAP_ASSERT_CONSISTENT(map, root);
 	CTR4(KTR_VM, "%s: map %p, nentries %d, entry %p",
 	    __func__, map, map->nentries, entry);
 }
@@ -1635,7 +1635,7 @@
 		root->right = NULL;
 	}
 	vm_map_splay_merge(map, root, llist, rlist);
-	VM_MAP_ASSERT_CONSISTENT(map);
+	VM_MAP_ASSERT_CONSISTENT(map, root);
 	if (length <= gap_end - start)
 		return (start);
 
@@ -1672,7 +1672,7 @@
 		root->right = y;
 	}
 	vm_map_splay_merge(map, root, llist, &map->header);
-	VM_MAP_ASSERT_CONSISTENT(map);
+	VM_MAP_ASSERT_CONSISTENT(map, root);
 	return (root->end);
 }
 
@@ -4786,44 +4786,36 @@
 
 #ifdef INVARIANTS
 static void
-_vm_map_assert_consistent(vm_map_t map)
+_vm_map_assert_consistent(vm_map_t map, vm_map_entry_t entry)
 {
-	vm_map_entry_t entry, prev;
 	vm_size_t max_left, max_right;
 
-	if (!enable_vmmap_check)
+	if (!enable_vmmap_check || entry == NULL)
 		return;
 
-	prev = &map->header;
-	VM_MAP_ENTRY_FOREACH(entry, map) {
-		KASSERT(prev->end <= entry->start,
-		    ("map %p prev->end = %jx, start = %jx", map,
-		    (uintmax_t)prev->end, (uintmax_t)entry->start));
-		KASSERT(entry->start < entry->end,
-		    ("map %p start = %jx, end = %jx", map,
-		    (uintmax_t)entry->start, (uintmax_t)entry->end));
-		KASSERT(entry->end <= entry->next->start,
-		    ("map %p end = %jx, next->start = %jx", map,
-		    (uintmax_t)entry->end, (uintmax_t)entry->next->start));
-		KASSERT(entry->left == NULL ||
-		    entry->left->start < entry->start,
-		    ("map %p left->start = %jx, start = %jx", map,
-		    (uintmax_t)entry->left->start, (uintmax_t)entry->start));
-		KASSERT(entry->right == NULL ||
-		    entry->start < entry->right->start,
-		    ("map %p start = %jx, right->start = %jx", map,
-		    (uintmax_t)entry->start, (uintmax_t)entry->right->start));
-		max_left = vm_map_entry_max_free_left(entry, entry->prev);
-		max_right = vm_map_entry_max_free_right(entry, entry->next);
-		KASSERT(entry->max_free == MAX(max_left, max_right),
-		    ("map %p max = %jx, max_left = %jx, max_right = %jx", map,
-		    (uintmax_t)entry->max_free,
-		    (uintmax_t)max_left, (uintmax_t)max_right));
-		prev = entry;
-	}	
-	KASSERT(prev->end <= entry->start,
+	KASSERT(entry->prev->end <= entry->start,
 	    ("map %p prev->end = %jx, start = %jx", map,
-	    (uintmax_t)prev->end, (uintmax_t)entry->start));
+	    (uintmax_t)entry->prev->end, (uintmax_t)entry->start));
+	KASSERT(entry->start < entry->end,
+	    ("map %p start = %jx, end = %jx", map,
+	    (uintmax_t)entry->start, (uintmax_t)entry->end));
+	KASSERT(entry->end <= entry->next->start,
+	    ("map %p end = %jx, next->start = %jx", map,
+	    (uintmax_t)entry->end, (uintmax_t)entry->next->start));
+	KASSERT(entry->left == NULL ||
+	    entry->left->start < entry->start,
+	    ("map %p left->start = %jx, start = %jx", map,
+	    (uintmax_t)entry->left->start, (uintmax_t)entry->start));
+	KASSERT(entry->right == NULL ||
+	    entry->start < entry->right->start,
+	    ("map %p start = %jx, right->start = %jx", map,
+	    (uintmax_t)entry->start, (uintmax_t)entry->right->start));
+	max_left = vm_map_entry_max_free_left(entry, entry->prev);
+	max_right = vm_map_entry_max_free_right(entry, entry->next);
+	KASSERT(entry->max_free == MAX(max_left, max_right),
+	    ("map %p max = %jx, max_left = %jx, max_right = %jx", map,
+	    (uintmax_t)entry->max_free,
+	    (uintmax_t)max_left, (uintmax_t)max_right));
 }
 #endif