Change callers of mtx_init() to pass in an appropriate lock type name. In

most cases NULL is passed, but in some cases such as network driver locks
(which use the MTX_NETWORK_LOCK macro) and UMA zone locks, a name is used.

Tested on:	i386, alpha, sparc64

10 files changed, 16 insertions, 13 deletions

diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 749f2f0..b1d05a6 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -92,7 +92,7 @@ dev_pager_init()
 {
 	TAILQ_INIT(&dev_pager_object_list);
 	sx_init(&dev_pager_sx, "dev_pager create");
-	mtx_init(&dev_pager_mtx, "dev_pager list", MTX_DEF);
+	mtx_init(&dev_pager_mtx, "dev_pager list", NULL, MTX_DEF);
 	fakepg_zone = uma_zcreate("DP fakepg", sizeof(struct vm_page),
 	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); 
 }
diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c
index e5e3413..76b7efc 100644
--- a/sys/vm/phys_pager.c
+++ b/sys/vm/phys_pager.c
@@ -53,7 +53,7 @@ phys_pager_init(void)
 {
 
 	TAILQ_INIT(&phys_pager_object_list);
-	mtx_init(&phys_pager_mtx, "phys_pager list", MTX_DEF);
+	mtx_init(&phys_pager_mtx, "phys_pager list", NULL, MTX_DEF);
 }
 
 static vm_object_t
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 778767e..f9507e7 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -259,7 +259,7 @@ swap_pager_init()
 	for (i = 0; i < NOBJLISTS; ++i)
 		TAILQ_INIT(&swap_pager_object_list[i]);
 	TAILQ_INIT(&swap_pager_un_object_list);
-	mtx_init(&sw_alloc_mtx, "swap_pager list", MTX_DEF);
+	mtx_init(&sw_alloc_mtx, "swap_pager list", NULL, MTX_DEF);
 
 	/*
 	 * Device Stripe, in PAGE_SIZE'd blocks
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index e920a97..218ffbb 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -1047,7 +1047,7 @@ uma_startup(void *bootmem)
 	printf("Max cpu = %d, mp_maxid = %d\n", maxcpu, mp_maxid);
 	Debugger("stop");
 #endif
-	mtx_init(&uma_mtx, "UMA lock", MTX_DEF);
+	mtx_init(&uma_mtx, "UMA lock", NULL, MTX_DEF);
 	/* "manually" Create the initial zone */
 	args.name = "UMA Zones";
 	args.size = sizeof(struct uma_zone) +
diff --git a/sys/vm/uma_int.h b/sys/vm/uma_int.h
index ffb8603..80ff331 100644
--- a/sys/vm/uma_int.h
+++ b/sys/vm/uma_int.h
@@ -281,13 +281,15 @@ void uma_large_free(uma_slab_t slab);
 
 /* Lock Macros */
 
-#define	ZONE_LOCK_INIT(z)	mtx_init(&(z)->uz_lock, (z)->uz_name, MTX_DEF)
+#define	ZONE_LOCK_INIT(z)	\
+	mtx_init(&(z)->uz_lock, (z)->uz_name, "UMA zone", MTX_DEF)
 #define	ZONE_LOCK_FINI(z)	mtx_destroy(&(z)->uz_lock)
 #define	ZONE_LOCK(z)	mtx_lock(&(z)->uz_lock)
 #define ZONE_UNLOCK(z)	mtx_unlock(&(z)->uz_lock)
 
 #define	CPU_LOCK_INIT(z, cpu)	\
-	mtx_init(&(z)->uz_cpu[(cpu)].uc_lock, (z)->uz_lname, MTX_DUPOK|MTX_DEF)
+	mtx_init(&(z)->uz_cpu[(cpu)].uc_lock, (z)->uz_lname, "UMA cpu",	\
+	    MTX_DEF | MTX_DUPOK)
 
 #define	CPU_LOCK_FINI(z, cpu)	\
 	mtx_destroy(&(z)->uz_cpu[(cpu)].uc_lock)
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 68bd1dd..37c329d 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -238,7 +238,7 @@ vm_object_init(void)
 	GIANT_REQUIRED;
 
 	TAILQ_INIT(&vm_object_list);
-	mtx_init(&vm_object_list_mtx, "vm object_list", MTX_DEF);
+	mtx_init(&vm_object_list_mtx, "vm object_list", NULL, MTX_DEF);
 	
 	kernel_object = &kernel_object_store;
 	_vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS),
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index bdc92ea..967ba69 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -261,7 +261,8 @@ vm_page_startup(vm_offset_t starta, vm_offset_t enda, vm_offset_t vaddr)
 		bucket++;
 	}
 	for (i = 0; i < BUCKET_HASH_SIZE; ++i)
-		mtx_init(&vm_buckets_mtx[i],  "vm buckets hash mutexes", MTX_DEF);
+		mtx_init(&vm_buckets_mtx[i],  "vm buckets hash mutexes", NULL,
+		    MTX_DEF);
 
 	/*
 	 * Compute the number of pages of memory that will be available for
diff --git a/sys/vm/vm_pageq.c b/sys/vm/vm_pageq.c
index 4f0b735..d6036a8 100644
--- a/sys/vm/vm_pageq.c
+++ b/sys/vm/vm_pageq.c
@@ -43,7 +43,7 @@ vm_pageq_init(void)
 
 	for (i = 0; i < PQ_COUNT; i++) {
 		TAILQ_INIT(&vm_page_queues[i].pl);
-		mtx_init(&vm_pageq_mtx[i], "vm pageq mutex", MTX_DEF);
+		mtx_init(&vm_pageq_mtx[i], "vm pageq mutex", NULL, MTX_DEF);
 	}
 }
 
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index c3cbbc7..4d6d5a9 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -216,7 +216,7 @@ vm_pager_bufferinit()
 	struct buf *bp;
 	int i;
 
-	mtx_init(&pbuf_mtx, "pbuf mutex", MTX_DEF);
+	mtx_init(&pbuf_mtx, "pbuf mutex", NULL, MTX_DEF);
 	bp = swbuf;
 	/*
 	 * Now set up swap and physical I/O buffer headers.
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index 5057b6e..31ec81c 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -79,7 +79,7 @@ static int zone_kmem_kvaspace;	/* Number of non-intsafe pages allocated */
 void
 vm_zone_init(void)
 {
-	mtx_init(&zone_mtx, "zone subsystem", MTX_DEF);
+	mtx_init(&zone_mtx, "zone subsystem", NULL, MTX_DEF);
 	SLIST_INIT(&zlist);
 }
 
@@ -175,7 +175,7 @@ zinitna(vm_zone_t z, vm_object_t obj, char *name, int size,
 
 	/* our zone is good and ready, add it to the list */
 	if ((z->zflags & ZONE_BOOT) == 0) {
-		mtx_init(&(z)->zmtx, "zone", MTX_DEF);
+		mtx_init(&(z)->zmtx, "zone", NULL, MTX_DEF);
 		mtx_lock(&zone_mtx);
 		SLIST_INSERT_HEAD(&zlist, z, zent);
 		mtx_unlock(&zone_mtx);
@@ -232,7 +232,7 @@ zbootinit(vm_zone_t z, char *name, int size, void *item, int nitems)
 	z->zpagecount = 0;
 	z->zalloc = 0;
 	z->znalloc = 0;
-	mtx_init(&(z)->zmtx, "zone", MTX_DEF);
+	mtx_init(&(z)->zmtx, "zone", NULL, MTX_DEF);
 
 	bzero(item, nitems * z->zsize);
 	z->zitems = NULL;