diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index f8d883c9f53..3a41c336014 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -219,6 +219,7 @@ SYSCTL_INT(_vm, OID_AUTO, swap_async_max,
 static struct mtx sw_alloc_mtx;	/* protect list manipulation */ 
 static struct pagerlst	swap_pager_object_list[NOBJLISTS];
 static uma_zone_t	swap_zone;
+static struct vm_object	swap_zone_obj;
 
 /*
  * pagerops for OBJT_SWAP - "swap pager".  Some ops are also global procedure
@@ -419,7 +420,7 @@ swap_pager_swap_init(void)
 	swap_zone = uma_zcreate("SWAPMETA", sizeof(struct swblock), NULL, NULL,
 	    NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE | UMA_ZONE_VM);
 	do {
-		if (uma_zone_set_obj(swap_zone, NULL, n))
+		if (uma_zone_set_obj(swap_zone, &swap_zone_obj, n))
 			break;
 		/*
 		 * if the allocation failed, try a zone two thirds the
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 6f6157fc031..25d00b40efc 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -2304,7 +2304,7 @@ uma_zone_set_obj(uma_zone_t zone, struct vm_object *obj, int count)
 	if (pages * keg->uk_ipers < count)
 		pages++;
 
-	kva = kmem_alloc_pageable(kernel_map, pages * UMA_SLAB_SIZE);
+	kva = kmem_alloc_nofault(kernel_map, pages * UMA_SLAB_SIZE);
 
 	if (kva == 0)
 		return (0);
@@ -2312,7 +2312,7 @@ uma_zone_set_obj(uma_zone_t zone, struct vm_object *obj, int count)
 		obj = vm_object_allocate(OBJT_DEFAULT,
 		    pages);
 	} else {
-		VM_OBJECT_LOCK_INIT(obj);
+		VM_OBJECT_LOCK_INIT(obj, "uma object");
 		_vm_object_allocate(OBJT_DEFAULT,
 		    pages, obj);
 	}
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 37017377ca1..01540f976f1 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -182,7 +182,7 @@ vm_object_zinit(void *mem, int size)
 
 	object = (vm_object_t)mem;
 	bzero(&object->mtx, sizeof(object->mtx));
-	VM_OBJECT_LOCK_INIT(object);
+	VM_OBJECT_LOCK_INIT(object, "standard object");
 
 	/* These are true for any object that has been freed */
 	object->paging_in_progress = 0;
@@ -234,16 +234,11 @@ vm_object_init(void)
 	TAILQ_INIT(&vm_object_list);
 	mtx_init(&vm_object_list_mtx, "vm object_list", NULL, MTX_DEF);
 	
-	VM_OBJECT_LOCK_INIT(&kernel_object_store);
+	VM_OBJECT_LOCK_INIT(&kernel_object_store, "kernel object");
 	_vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS),
 	    kernel_object);
 
-	/*
-	 * The kmem object's mutex is given a unique name, instead of
-	 * "vm object", to avoid false reports of lock-order reversal
-	 * with a system map mutex.
-	 */
-	mtx_init(VM_OBJECT_MTX(kmem_object), "kmem object", NULL, MTX_DEF);
+	VM_OBJECT_LOCK_INIT(&kmem_object_store, "kmem object");
 	_vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS),
 	    kmem_object);
 
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 8d327627d03..52ba63ce9ad 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -172,8 +172,9 @@ extern struct vm_object kmem_object_store;
 #define	VM_OBJECT_LOCK(object)		mtx_lock(&(object)->mtx)
 #define	VM_OBJECT_LOCK_ASSERT(object, type) \
 					mtx_assert(&(object)->mtx, (type))
-#define	VM_OBJECT_LOCK_INIT(object)	mtx_init(&(object)->mtx, "vm object", \
-					    NULL, MTX_DEF | MTX_DUPOK)
+#define	VM_OBJECT_LOCK_INIT(object, type) \
+					mtx_init(&(object)->mtx, "vm object", \
+					    (type), MTX_DEF | MTX_DUPOK)
 #define	VM_OBJECT_LOCKED(object)	mtx_owned(&(object)->mtx)
 #define	VM_OBJECT_MTX(object)		(&(object)->mtx)
 #define	VM_OBJECT_TRYLOCK(object)	mtx_trylock(&(object)->mtx)