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

15 files changed, 28 insertions, 28 deletions

diff --git a/sys/i4b/capi/capi_l4if.c b/sys/i4b/capi/capi_l4if.c
index ff17b6e..f68eff7 100644
--- a/sys/i4b/capi/capi_l4if.c
+++ b/sys/i4b/capi/capi_l4if.c
@@ -240,9 +240,9 @@ capi_ll_attach(capi_softc_t *sc)
 	sc->sc_bchan[i].rx_queue.ifq_maxlen = IFQ_MAXLEN;
 
 	if(!mtx_initialized(&sc->sc_bchan[i].tx_queue.ifq_mtx))
-		mtx_init(&sc->sc_bchan[i].tx_queue.ifq_mtx, "i4b_capi_tx", MTX_DEF);
+		mtx_init(&sc->sc_bchan[i].tx_queue.ifq_mtx, "i4b_capi_tx", NULL, MTX_DEF);
 	if(!mtx_initialized(&sc->sc_bchan[i].rx_queue.ifq_mtx))	
-		mtx_init(&sc->sc_bchan[i].rx_queue.ifq_mtx, "i4b_capi_rx", MTX_DEF);	
+		mtx_init(&sc->sc_bchan[i].rx_queue.ifq_mtx, "i4b_capi_rx", NULL, MTX_DEF);	
 
 	sc->sc_bchan[i].txcount = 0;
 	sc->sc_bchan[i].rxcount = 0;
diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c
index 84b7cae..48ad6e4 100644
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@@ -225,7 +225,7 @@ iavc_isa_attach(device_t dev)
 	sc->sc_txq.ifq_maxlen = sc->sc_capi.sc_nbch * 4;
 
         if(!mtx_initialized(&sc->sc_txq.ifq_mtx))
-		mtx_init(&sc->sc_txq.ifq_mtx, "i4b_ivac_isa", MTX_DEF);
+		mtx_init(&sc->sc_txq.ifq_mtx, "i4b_ivac_isa", NULL, MTX_DEF);
 
 	sc->sc_intr = FALSE;
 	sc->sc_state = IAVC_DOWN;
diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c
index c22be11..4f922fe 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -236,7 +236,7 @@ iavc_pci_attach(device_t dev)
     sc->sc_txq.ifq_maxlen = sc->sc_capi.sc_nbch * 4;
 
     if(!mtx_initialized(&sc->sc_txq.ifq_mtx))
-	    mtx_init(&sc->sc_txq.ifq_mtx, "i4b_ivac_pci", MTX_DEF);
+	    mtx_init(&sc->sc_txq.ifq_mtx, "i4b_ivac_pci", NULL, MTX_DEF);
     
     sc->sc_intr = FALSE;
     sc->sc_state = IAVC_DOWN;
diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c
index fd7d816..c6eb497 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -245,7 +245,7 @@ i4bingattach(void *dummy)
 		
 		sc->sc_fastq.ifq_maxlen = I4BINGMAXQLEN;
 		if(!mtx_initialized(&sc->sc_fastq.ifq_mtx))
-			mtx_init(&sc->sc_fastq.ifq_mtx, "i4b_ing_fastq", MTX_DEF);
+			mtx_init(&sc->sc_fastq.ifq_mtx, "i4b_ing_fastq", NULL, MTX_DEF);
 		
 #if I4BINGACCT
 		callout_handle_init(&sc->sc_callout);
@@ -288,9 +288,9 @@ i4bingattach(void *dummy)
 		sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
 		sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
 		if(!mtx_initialized(&sc->xmitq.ifq_mtx))
-			mtx_init(&sc->xmitq.ifq_mtx, "i4b_ing_xmitq", MTX_DEF);
+			mtx_init(&sc->xmitq.ifq_mtx, "i4b_ing_xmitq", NULL, MTX_DEF);
 		if(!mtx_initialized(&sc->xmitq_hipri.ifq_mtx))
-			mtx_init(&sc->xmitq_hipri.ifq_mtx, "i4b_ing_hipri", MTX_DEF);
+			mtx_init(&sc->xmitq_hipri.ifq_mtx, "i4b_ing_hipri", NULL, MTX_DEF);
 	}
 }
 
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index 5489688..e86a9cb 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -226,7 +226,7 @@ i4biprattach(void *dummy)
 		sc->sc_fastq.ifq_maxlen = I4BIPRMAXQLEN;
 
 		if(!mtx_initialized(&sc->sc_fastq.ifq_mtx))
-			mtx_init(&sc->sc_fastq.ifq_mtx, "i4b_ipr_fastq", MTX_DEF);
+			mtx_init(&sc->sc_fastq.ifq_mtx, "i4b_ipr_fastq", NULL, MTX_DEF);
 
 		sc->sc_if.if_ipackets = 0;
 		sc->sc_if.if_ierrors = 0;
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 41c5536..e948925 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -177,7 +177,7 @@ i4brbchattach(void *dummy)
 		rbch_softc[i].sc_hdlcq.ifq_maxlen = I4BRBCHMAXQLEN;
 
 		if(!mtx_initialized(&rbch_softc[i].sc_hdlcq.ifq_mtx))
-			mtx_init(&rbch_softc[i].sc_hdlcq.ifq_mtx, "i4b_rbch", MTX_DEF);
+			mtx_init(&rbch_softc[i].sc_hdlcq.ifq_mtx, "i4b_rbch", NULL, MTX_DEF);
 
 		rbch_softc[i].it_in.c_ispeed = rbch_softc[i].it_in.c_ospeed = 64000;
 		termioschars(&rbch_softc[i].it_in);
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 20bbbf2..ebfc277 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -131,7 +131,7 @@ i4btrcattach(void *dummy)
 		trace_queue[i].ifq_maxlen = IFQ_MAXLEN;
 
 		if(!mtx_initialized(&trace_queue[i].ifq_mtx))
-			mtx_init(&trace_queue[i].ifq_mtx, "i4b_trace", MTX_DEF);
+			mtx_init(&trace_queue[i].ifq_mtx, "i4b_trace", NULL, MTX_DEF);
 
 		device_state[i] = ST_IDLE;
 	}
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index d072b9c..5be982d 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -652,14 +652,14 @@ avma1pp_attach_avma1pp(device_t dev)
 	/* Init the channel mutexes */
 	chan = &sc->sc_chan[HSCX_CH_A];
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp_rx", NULL, MTX_DEF);
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp_tx", NULL, MTX_DEF);
 	chan = &sc->sc_chan[HSCX_CH_B];
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp_rx", NULL, MTX_DEF);
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp_tx", NULL, MTX_DEF);
 #endif
 
 	/* init the "HSCX" */
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index 01794f3..981473b 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -582,14 +582,14 @@ avma1pp2_attach_avma1pp(device_t dev)
 	/* Init the channel mutexes */
 	chan = &sc->sc_chan[HSCX_CH_A];
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp2_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp2_rx", NULL, MTX_DEF);
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp2_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp2_tx", NULL, MTX_DEF);
 	chan = &sc->sc_chan[HSCX_CH_B];
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp2_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp2_rx", NULL, MTX_DEF);
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp2_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp2_tx", NULL, MTX_DEF);
 #endif
 
 	/* init the "HSCX" */
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index 89c5550..bb8c5f1 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -1047,7 +1047,7 @@ avm_pnp_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avm_pnp_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avm_pnp_rx", NULL, MTX_DEF);
 #endif
 
 	i4b_Bcleanifq(&chan->rx_queue);	/* clean rx queue */
@@ -1066,7 +1066,7 @@ avm_pnp_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avm_pnp_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avm_pnp_tx", NULL, MTX_DEF);
 #endif
 	i4b_Bcleanifq(&chan->tx_queue);	/* clean tx queue */
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 06254db..db31c8c 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -361,7 +361,7 @@ ihfc_init (ihfc_sc_t *sc, u_char chan, int prot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 			if(!mtx_initialized(&S_IFQUEUE.ifq_mtx))
-				mtx_init(&S_IFQUEUE.ifq_mtx, "i4b_ihfc", MTX_DEF);
+				mtx_init(&S_IFQUEUE.ifq_mtx, "i4b_ihfc", NULL, MTX_DEF);
 #endif
 			if (!activate) continue;
 
@@ -387,7 +387,7 @@ ihfc_init (ihfc_sc_t *sc, u_char chan, int prot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 			if(!mtx_initialized(&S_IFQUEUE.ifq_mtx))
-				mtx_init(&S_IFQUEUE.ifq_mtx, "i4b_ihfc", MTX_DEF);
+				mtx_init(&S_IFQUEUE.ifq_mtx, "i4b_ihfc", NULL, MTX_DEF);
 #endif
 			S_PROT = prot;
 
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index f8b6f0d..580e9a9 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -90,7 +90,7 @@ isic_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 	chan->rx_queue.ifq_maxlen = IFQ_MAXLEN;
 
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_isic_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_isic_rx", NULL, MTX_DEF);
 
 	i4b_Bcleanifq(&chan->rx_queue);	/* clean rx queue */
 
@@ -107,7 +107,7 @@ isic_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 	chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
 
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_isic_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_isic_tx", NULL, MTX_DEF);
 	
 	i4b_Bcleanifq(&chan->tx_queue);	/* clean tx queue */
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
index 2856992..510025e 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -436,7 +436,7 @@ iwic_bchannel_setup(int unit, int chan_no, int bprot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_iwic_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_iwic_rx", NULL, MTX_DEF);
 #endif
 
 	i4b_Bcleanifq(&chan->rx_queue);	/* clean rx queue */
@@ -455,7 +455,7 @@ iwic_bchannel_setup(int unit, int chan_no, int bprot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4	
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_iwic_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_iwic_tx", NULL, MTX_DEF);
 #endif
 
 	i4b_Bcleanifq(&chan->tx_queue);	/* clean tx queue */
diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c
index 745b465..9b36402 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -265,7 +265,7 @@ i4b_mph_status_ind(int unit, int status, int parm)
 			l2sc->i_queue.ifq_maxlen = IQUEUE_MAXLEN;
 
 			if(!mtx_initialized(&l2sc->i_queue.ifq_mtx))
-				mtx_init(&l2sc->i_queue.ifq_mtx, "i4b_l2sc", MTX_DEF);
+				mtx_init(&l2sc->i_queue.ifq_mtx, "i4b_l2sc", NULL, MTX_DEF);
 
 			l2sc->ua_frame = NULL;
 			bzero(&l2sc->stat, sizeof(lapdstat_t));			
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index e0c4d6a..1617077 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -127,7 +127,7 @@ i4battach(void *dummy)
 	i4b_rdqueue.ifq_maxlen = IFQ_MAXLEN;
 
 	if(!mtx_initialized(&i4b_rdqueue.ifq_mtx))
-		mtx_init(&i4b_rdqueue.ifq_mtx, "i4b_rdqueue", MTX_DEF);
+		mtx_init(&i4b_rdqueue.ifq_mtx, "i4b_rdqueue", NULL, MTX_DEF);
 
 	make_dev(&i4b_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "i4b");
 }