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

8 files changed, 13 insertions, 13 deletions

diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index c8b7c5e..a3c653c 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1704,8 +1704,8 @@ init386(first)
 	 *	     under witness.
 	 */
 	mutex_init();
-	mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE);
-	mtx_init(&icu_lock, "icu", MTX_SPIN | MTX_NOWITNESS);
+	mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_RECURSE);
+	mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS);
 
 	/* make ldt memory segments */
 	/*
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 50c91c7..2b5ac5a 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -334,7 +334,7 @@ init_locks(void)
 {
 
 #ifdef USE_COMLOCK
-	mtx_init(&com_mtx, "com", MTX_SPIN);
+	mtx_init(&com_mtx, "com", NULL, MTX_SPIN);
 #endif /* USE_COMLOCK */
 }
 
@@ -1928,7 +1928,7 @@ start_all_aps(u_int boot_addr)
 
 	POSTCODE(START_ALL_APS_POST);
 
-	mtx_init(&ap_boot_mtx, "ap boot", MTX_SPIN);
+	mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN);
 
 	/* initialize BSP's local APIC */
 	apic_initialize();
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 50c91c7..2b5ac5a 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -334,7 +334,7 @@ init_locks(void)
 {
 
 #ifdef USE_COMLOCK
-	mtx_init(&com_mtx, "com", MTX_SPIN);
+	mtx_init(&com_mtx, "com", NULL, MTX_SPIN);
 #endif /* USE_COMLOCK */
 }
 
@@ -1928,7 +1928,7 @@ start_all_aps(u_int boot_addr)
 
 	POSTCODE(START_ALL_APS_POST);
 
-	mtx_init(&ap_boot_mtx, "ap boot", MTX_SPIN);
+	mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN);
 
 	/* initialize BSP's local APIC */
 	apic_initialize();
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index fef6a00..ab85478 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -425,7 +425,7 @@ vm86_initialize(void)
 	pcb = &vml->vml_pcb;
 	ext = &vml->vml_ext;
 
-	mtx_init(&vm86_lock, "vm86 lock", MTX_DEF);
+	mtx_init(&vm86_lock, "vm86 lock", NULL, MTX_DEF);
 
 	bzero(pcb, sizeof(struct pcb));
 	pcb->new_ptd = vm86pa | PG_V | PG_RW | PG_U;
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 50c91c7..2b5ac5a 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -334,7 +334,7 @@ init_locks(void)
 {
 
 #ifdef USE_COMLOCK
-	mtx_init(&com_mtx, "com", MTX_SPIN);
+	mtx_init(&com_mtx, "com", NULL, MTX_SPIN);
 #endif /* USE_COMLOCK */
 }
 
@@ -1928,7 +1928,7 @@ start_all_aps(u_int boot_addr)
 
 	POSTCODE(START_ALL_APS_POST);
 
-	mtx_init(&ap_boot_mtx, "ap boot", MTX_SPIN);
+	mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN);
 
 	/* initialize BSP's local APIC */
 	apic_initialize();
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 0e980c5..b13f71a 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -148,8 +148,8 @@ el_probe(device_t dev)
 
 	sc->el_btag = rman_get_bustag(sc->el_res);
 	sc->el_bhandle = rman_get_bushandle(sc->el_res);
-	mtx_init(&sc->el_mtx,
-	    device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
+	mtx_init(&sc->el_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
+	    MTX_DEF | MTX_RECURSE);
 	EL_LOCK(sc);
 
 	/* Now attempt to grab the station address from the PROM
diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 59c739e..cfd6c69 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -604,7 +604,7 @@ static void
 ithds_init(void *dummy)
 {
 
-	mtx_init(&ithds_table_lock, "ithread table lock", MTX_SPIN);
+	mtx_init(&ithds_table_lock, "ithread table lock", NULL, MTX_SPIN);
 }
 SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL);
 
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index 59c739e..cfd6c69 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -604,7 +604,7 @@ static void
 ithds_init(void *dummy)
 {
 
-	mtx_init(&ithds_table_lock, "ithread table lock", MTX_SPIN);
+	mtx_init(&ithds_table_lock, "ithread table lock", NULL, MTX_SPIN);
 }
 SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL);