d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
John Baldwin 2002-04-04 21:03:38 +00:00
parent 96b0ad0ef3
commit 6008862bc2
162 changed files with 274 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/alpha/alpha/busdma_machdep.c
View File

@ -600,7 +600,7 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages)
count = 0;
if (total_bpages == 0) {
mtx_init(&bounce_lock, "BouncePage", MTX_DEF);
mtx_init(&bounce_lock, "BouncePage", NULL, MTX_DEF);
STAILQ_INIT(&bounce_page_list);
STAILQ_INIT(&bounce_map_waitinglist);
STAILQ_INIT(&bounce_map_callbacklist);

2
sys/alpha/alpha/interrupt.c
View File

@ -343,7 +343,7 @@ static void
ithds_init(void *dummy)
{
mtx_init(&alpha_intr_hash_lock, "ithread table lock", MTX_SPIN);
mtx_init(&alpha_intr_hash_lock, "ithread table lock", NULL, MTX_SPIN);
}
SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL);

4
sys/alpha/alpha/machdep.c
View File

@ -945,8 +945,8 @@ alpha_init(pfn, ptb, bim, bip, biv)
thread0.td_pcb->pcb_hw.apcb_ksp = (u_int64_t)thread0.td_frame;
mutex_init();
mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE);
mtx_init(&icu_lock, "icu", MTX_SPIN);
mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_RECURSE);
mtx_init(&icu_lock, "icu", NULL, MTX_SPIN);
/*
* Look at arguments passed to us and compute boothowto.

2
sys/alpha/alpha/mp_machdep.c
View File

@ -345,7 +345,7 @@ cpu_mp_start(void)
{
int i;
mtx_init(&ap_boot_mtx, "ap boot", MTX_SPIN);
mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN);
for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) {
int dv;

2
sys/alpha/alpha/pmap.c
View File

@ -1365,7 +1365,7 @@ pmap_pinit0(pmap)
}
TAILQ_INIT(&pmap->pm_pvlist);
bzero(&pmap->pm_stats, sizeof pmap->pm_stats);
mtx_init(&allpmaps_lock, "allpmaps", MTX_SPIN | MTX_QUIET);
mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN | MTX_QUIET);
LIST_INSERT_HEAD(&allpmaps, pmap, pm_list);
}

4
sys/amd64/amd64/machdep.c
View File

@ -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 */
/*

4
sys/amd64/amd64/mp_machdep.c
View File

@ -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();

4
sys/amd64/amd64/mptable.c
View File

@ -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();

4
sys/amd64/include/mptable.h
View File

@ -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();

2
sys/amd64/isa/intr_machdep.c
View File

@ -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);

2
sys/amd64/isa/nmi.c
View File

@ -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);

2
sys/dev/aac/aacvar.h
View File

@ -254,7 +254,7 @@ TAILQ_HEAD(aac_container_tq, aac_container);
#include <sys/lock.h>
#include <sys/mutex.h>
typedef struct mtx aac_lock_t;
#define AAC_LOCK_INIT(l, s) mtx_init(l, s, MTX_DEF)
#define AAC_LOCK_INIT(l, s) mtx_init(l, s, NULL, MTX_DEF)
#define AAC_LOCK_ACQUIRE(l) mtx_lock(l)
#define AAC_LOCK_RELEASE(l) mtx_unlock(l)
#else

2
sys/dev/acpica/Osd/OsdSchedule.c
View File

@ -144,7 +144,7 @@ acpi_task_thread_init(void)
err = 0;
STAILQ_INIT(&acpi_task_queue);
mtx_init(&acpi_task_mtx, "ACPI task", MTX_DEF);
mtx_init(&acpi_task_mtx, "ACPI task", NULL, MTX_DEF);
for (i = 0; i < ACPI_MAX_THREADS; i++) {
err = kthread_create(acpi_task_thread, NULL, &acpi_kthread_proc,

2
sys/dev/acpica/Osd/OsdSynch.c
View File

@ -85,7 +85,7 @@ AcpiOsCreateSemaphore(UINT32 MaxUnits, UINT32 InitialUnits, ACPI_HANDLE *OutHand
return_ACPI_STATUS(AE_NO_MEMORY);
bzero(as, sizeof(*as));
mtx_init(&as->as_mtx, "ACPI semaphore", MTX_DEF);
mtx_init(&as->as_mtx, "ACPI semaphore", NULL, MTX_DEF);
as->as_units = InitialUnits;
as->as_maxunits = MaxUnits;
as->as_pendings = as->as_resetting = as->as_timeouts = 0;

2
sys/dev/acpica/acpi.c
View File

@ -234,7 +234,7 @@ acpi_identify(driver_t *driver, device_t parent)
return_VOID;
/* initialise the ACPI mutex */
mtx_init(&acpi_mutex, "ACPI global lock", MTX_DEF);
mtx_init(&acpi_mutex, "ACPI global lock", NULL, MTX_DEF);
/*
* Start up the ACPI CA subsystem.

4
sys/dev/an/if_an.c
View File

@ -377,8 +377,8 @@ an_attach(sc, unit, flags)
{
struct ifnet *ifp = &sc->arpcom.ac_if;
mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_DEF |
MTX_RECURSE);
mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
AN_LOCK(sc);
sc->an_gone = 0;

5
sys/dev/ar/if_ar.c
View File

@ -336,8 +336,9 @@ ar_attach(device_t device)
callout_handle_init(&sc->handle);
sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
mtx_init(&sc->xmitq.ifq_mtx, "ar_xmitq", MTX_DEF);
mtx_init(&sc->xmitq_hipri.ifq_mtx, "ar_xmitq_hipri", MTX_DEF);
mtx_init(&sc->xmitq.ifq_mtx, "ar_xmitq", NULL, MTX_DEF);
mtx_init(&sc->xmitq_hipri.ifq_mtx, "ar_xmitq_hipri", NULL,
MTX_DEF);
sc->running = 0;
#endif /* NETGRAPH */
}

3
sys/dev/dc/if_dc.c
View File

@ -1781,7 +1781,8 @@ static int dc_attach(dev)
unit = device_get_unit(dev);
bzero(sc, sizeof(struct dc_softc));
mtx_init(&sc->dc_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
mtx_init(&sc->dc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
DC_LOCK(sc);
/*

3
sys/dev/fxp/if_fxp.c
View File

@ -360,7 +360,8 @@ fxp_attach(device_t dev)
sc->dev = dev;
callout_handle_init(&sc->stat_ch);
sysctl_ctx_init(&sc->sysctl_ctx);
mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
s = splimp();

2
sys/dev/fxp/if_fxpvar.h
View File

@ -91,7 +91,7 @@
#if __FreeBSD_version < 500000
#define FXP_LOCK(_sc)
#define FXP_UNLOCK(_sc)
#define mtx_init(a, b, c)
#define mtx_init(a, b, c, d)
#define mtx_destroy(a)
struct mtx { int dummy; };
#else

3
sys/dev/gx/if_gx.c
View File

@ -245,7 +245,8 @@ gx_attach(device_t dev)
gx->gx_vflags = gx_dev->version_flags;
gx->gx_ipg = gx_dev->version_ipg;
mtx_init(&gx->gx_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
mtx_init(&gx->gx_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
GX_LOCK(gx);

2
sys/dev/gx/if_gxvar.h
View File

@ -32,7 +32,7 @@
#if __FreeBSD_version < 500000
#define GX_LOCK(gx)
#define GX_UNLOCK(gx)
#define mtx_init(a, b, c)
#define mtx_init(a, b, c, d)
#define mtx_destroy(a)
struct mtx { int filler; };
#else

2
sys/dev/ichsmb/ichsmb.c
View File

@ -129,7 +129,7 @@ ichsmb_attach(device_t dev)
}
/* Create mutex */
mtx_init(&sc->mutex, device_get_nameunit(dev), MTX_DEF);
mtx_init(&sc->mutex, device_get_nameunit(dev), "ichsmb", MTX_DEF);
return (0);
}

2
sys/dev/isp/isp_pci.c
View File

@ -683,7 +683,7 @@ isp_pci_attach(device_t dev)
"debug", &isp_debug);
/* Make sure the lock is set up. */
mtx_init(&isp->isp_osinfo.lock, "isp", MTX_DEF);
mtx_init(&isp->isp_osinfo.lock, "isp", NULL, MTX_DEF);
locksetup++;
#ifdef ISP_SMPLOCK

4
sys/dev/lmc/if_lmc.c
View File

@ -1148,8 +1148,8 @@ lmc_attach(lmc_softc_t * const sc)
callout_handle_init(&sc->lmc_handle);
sc->lmc_xmitq.ifq_maxlen = IFQ_MAXLEN;
sc->lmc_xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
mtx_init(&sc->lmc_xmitq.ifq_mtx, "lmc_xmitq", MTX_DEF);
mtx_init(&sc->lmc_xmitq_hipri.ifq_mtx, "lmc_xmitq_hipri", MTX_DEF);
mtx_init(&sc->lmc_xmitq.ifq_mtx, "lmc_xmitq", NULL, MTX_DEF);
mtx_init(&sc->lmc_xmitq_hipri.ifq_mtx, "lmc_xmitq_hipri", NULL, MTX_DEF);
sc->lmc_running = 0;
/*

3
sys/dev/nge/if_nge.c
View File

@ -797,7 +797,8 @@ static int nge_attach(dev)
unit = device_get_unit(dev);
bzero(sc, sizeof(struct nge_softc));
mtx_init(&sc->nge_mtx, device_get_nameunit(dev), MTX_DEF|MTX_RECURSE);
mtx_init(&sc->nge_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
/*
* Handle power management nonsense.

2
sys/dev/pccbb/pccbb.c
View File

@ -527,7 +527,7 @@ pccbb_attach(device_t brdev)
int rid;
uint32_t sockbase;
mtx_init(&sc->mtx, device_get_nameunit(brdev), MTX_DEF);
mtx_init(&sc->mtx, device_get_nameunit(brdev), "pccbb", MTX_DEF);
sc->chipset = pccbb_chipset(pci_get_devid(brdev), NULL);
sc->dev = brdev;
sc->cbdev = NULL;

3
sys/dev/pdq/pdq_ifsubr.c
View File

@ -426,7 +426,8 @@ pdq_ifattach(pdq_softc_t *sc)
{
struct ifnet *ifp = &sc->sc_if;
mtx_init(&sc->mtx, device_get_nameunit(sc->dev), MTX_DEF | MTX_RECURSE);
mtx_init(&sc->mtx, device_get_nameunit(sc->dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
ifp->if_softc = sc;
ifp->if_init = (if_init_f_t *)pdq_ifinit;

2
sys/dev/random/yarrow.c
View File

@ -139,7 +139,7 @@ random_init(void)
random_state.counter[i] = 0;
/* Set up a lock for the reseed process */
mtx_init(&random_reseed_mtx, "random reseed", MTX_DEF);
mtx_init(&random_reseed_mtx, "random reseed", NULL, MTX_DEF);
}
void

3
sys/dev/sf/if_sf.c
View File

@ -671,7 +671,8 @@ static int sf_attach(dev)
unit = device_get_unit(dev);
bzero(sc, sizeof(struct sf_softc));
mtx_init(&sc->sf_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
mtx_init(&sc->sf_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
SF_LOCK(sc);
/*
* Handle power management nonsense.

3
sys/dev/sio/sio.c
View File

@ -513,7 +513,8 @@ sioprobe(dev, xrid, rclk, noprobe)
while (sio_inited != 2)
if (atomic_cmpset_int(&sio_inited, 0, 1)) {
mtx_init(&sio_lock, sio_driver_name, (comconsole != -1) ?
mtx_init(&sio_lock, sio_driver_name, NULL,
(comconsole != -1) ?
MTX_SPIN | MTX_QUIET : MTX_SPIN);
atomic_store_rel_int(&sio_inited, 2);
}

3
sys/dev/sk/if_sk.c
View File

@ -1183,7 +1183,8 @@ static int sk_attach(dev)
unit = device_get_unit(dev);
bzero(sc, sizeof(struct sk_softc));
mtx_init(&sc->sk_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
mtx_init(&sc->sk_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
SK_LOCK(sc);
/*

2
sys/dev/sound/isa/emu8000.c
View File

@ -720,7 +720,7 @@ emu_attach(device_t dev)
/* Fill the softc for this unit. */
bcopy(&emu_synthinfo, &scp->synthinfo, sizeof(emu_synthinfo));
mtx_init(&scp->mtx, "emumid", MTX_DEF);
mtx_init(&scp->mtx, "emumid", NULL, MTX_DEF);
scp->devinfo = devinfo = create_mididev_info_unit(MDT_SYNTH, &emu_op_desc, &midisynth_op_desc);
/* Fill the midi info. */

2
sys/dev/sound/isa/gusmidi.c
View File

@ -194,7 +194,7 @@ gusmidi_init(device_t dev)
/* Fill the softc. */
scp->dev = dev;
mtx_init(&scp->mtx, "gusmid", MTX_DEF);
mtx_init(&scp->mtx, "gusmid", NULL, MTX_DEF);
scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &gusmidi_op_desc, &midisynth_op_desc);
/* Fill the midi info. */

2
sys/dev/sound/isa/mpu.c
View File

@ -358,7 +358,7 @@ mpu_attach(device_t dev)
MIDI_DEBUG(printf("mpu: attaching.\n"));
mtx_init(&scp->mtx, "mpumid", MTX_DEF);
mtx_init(&scp->mtx, "mpumid", NULL, MTX_DEF);
/* Allocate the resources, switch to uart mode. */
if (mpu_allocres(scp, dev) || mpu_uartmode(scp)) {

2
sys/dev/sound/isa/opl.c
View File

@ -717,7 +717,7 @@ opl_attach(device_t dev)
/* Fill the softc. */
bcopy(&opl_synthinfo, &scp->synthinfo, sizeof(opl_synthinfo));
snprintf(scp->synthinfo.name, 64, "Yamaha OPL%d FM", scp->model);
mtx_init(&scp->mtx, "oplmid", MTX_DEF);
mtx_init(&scp->mtx, "oplmid", NULL, MTX_DEF);
bcopy(pv_map, scp->pv_map, sizeof(pv_map));
if (scp->model < MODEL_OPL3) { /* OPL2. */
scp->synthinfo.nr_voices = 9;

2
sys/dev/sound/isa/uartsio.c
View File

@ -243,7 +243,7 @@ uartsio_attach(device_t dev)
/* Fill the softc. */
scp->dev = dev;
mtx_init(&scp->mtx, "siomid", MTX_DEF);
mtx_init(&scp->mtx, "siomid", NULL, MTX_DEF);
scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &uartsio_op_desc, &midisynth_op_desc);
/* Fill the midi info. */

14
sys/dev/sound/midi/midi.c
View File

@ -200,7 +200,7 @@ get_mididev_info_unit(int unit)
/* XXX */
if (!midiinfo_mtx_init) {
midiinfo_mtx_init = 1;
mtx_init(&midiinfo_mtx, "midinf", MTX_DEF);
mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF);
TAILQ_INIT(&midi_info);
}
@ -226,7 +226,7 @@ get_mididev_midi_unit(int unit)
/* XXX */
if (!midiinfo_mtx_init) {
midiinfo_mtx_init = 1;
mtx_init(&midiinfo_mtx, "midinf", MTX_DEF);
mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF);
TAILQ_INIT(&midi_info);
}
@ -252,7 +252,7 @@ get_mididev_synth_unit(int unit)
/* XXX */
if (!midiinfo_mtx_init) {
midiinfo_mtx_init = 1;
mtx_init(&midiinfo_mtx, "midinf", MTX_DEF);
mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF);
TAILQ_INIT(&midi_info);
}
@ -277,7 +277,7 @@ create_mididev_info_unit(int type, mididev_info *mdinf, synthdev_info *syninf)
/* XXX */
if (!midiinfo_mtx_init) {
midiinfo_mtx_init = 1;
mtx_init(&midiinfo_mtx, "midinf", MTX_DEF);
mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF);
TAILQ_INIT(&midi_info);
}
@ -290,9 +290,9 @@ create_mididev_info_unit(int type, mididev_info *mdinf, synthdev_info *syninf)
midibuf_init(&mdnew->midi_dbuf_in);
midibuf_init(&mdnew->midi_dbuf_out);
midibuf_init(&mdnew->midi_dbuf_passthru);
mtx_init(&mdnew->flagqueue_mtx, "midflq", MTX_DEF);
mtx_init(&mdnew->synth.vc_mtx, "synsvc", MTX_DEF);
mtx_init(&mdnew->synth.status_mtx, "synsst", MTX_DEF);
mtx_init(&mdnew->flagqueue_mtx, "midflq", NULL, MTX_DEF);
mtx_init(&mdnew->synth.vc_mtx, "synsvc", NULL, MTX_DEF);
mtx_init(&mdnew->synth.status_mtx, "synsst", NULL, MTX_DEF);
mtx_lock(&midiinfo_mtx);

4
sys/dev/sound/midi/sequencer.c
View File

@ -303,7 +303,7 @@ seq_init(void)
{
SEQ_DEBUG(printf("seq: initing.\n"));
mtx_init(&seqinfo_mtx, "seqinf", MTX_DEF);
mtx_init(&seqinfo_mtx, "seqinf", NULL, MTX_DEF);
TAILQ_INIT(&seq_info);
seq_initunit(0);
@ -2371,7 +2371,7 @@ create_seqdev_info_unit(int unit, seqdev_info *seq)
sdnew->unit = unit;
midibuf_init(&sdnew->midi_dbuf_in);
midibuf_init(&sdnew->midi_dbuf_out);
mtx_init(&sdnew->flagqueue_mtx, "seqflq", MTX_DEF);
mtx_init(&sdnew->flagqueue_mtx, "seqflq", NULL, MTX_DEF);
cv_init(&sdnew->insync_cv, "seqins");
mtx_lock(&seqinfo_mtx);

8
sys/dev/sound/midi/timer.c
View File

@ -141,7 +141,7 @@ create_timerdev_info_unit(timerdev_info *tmdinf)
/* XXX */
if (!timerinfo_mtx_init) {
timerinfo_mtx_init = 1;
mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF);
mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF);
TAILQ_INIT(&timer_info);
}
@ -150,7 +150,7 @@ create_timerdev_info_unit(timerdev_info *tmdinf)
if (tmdnew == NULL)
return NULL;
bcopy(tmdinf, tmdnew, sizeof(timerdev_info));
mtx_init(&tmdnew->mtx, "tmrmtx", MTX_DEF);
mtx_init(&tmdnew->mtx, "tmrmtx", NULL, MTX_DEF);
mtx_lock(&timerinfo_mtx);
@ -195,7 +195,7 @@ get_timerdev_info_unit(int unit)
/* XXX */
if (!timerinfo_mtx_init) {
timerinfo_mtx_init = 1;
mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF);
mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF);
TAILQ_INIT(&timer_info);
}
@ -224,7 +224,7 @@ get_timerdev_info(void)
/* XXX */
if (!timerinfo_mtx_init) {
timerinfo_mtx_init = 1;
mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF);
mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF);
TAILQ_INIT(&timer_info);
}

2
sys/dev/sound/pci/csamidi.c
View File

@ -192,7 +192,7 @@ csamidi_attach(device_t dev)
/* Fill the softc. */
scp->dev = dev;
mtx_init(&scp->mtx, "csamid", MTX_DEF);
mtx_init(&scp->mtx, "csamid", NULL, MTX_DEF);
scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &csamidi_op_desc, &midisynth_op_desc);
/* Fill the midi info. */

2
sys/dev/sound/pcm/sndstat.c
View File

@ -343,7 +343,7 @@ sndstat_prepare(struct sbuf *s)
static int
sndstat_init(void)
{
mtx_init(&sndstat_lock, "sndstat", 0);
mtx_init(&sndstat_lock, "sndstat", NULL, 0);
sndstat_dev = make_dev(&sndstat_cdevsw, SND_DEV_STATUS, UID_ROOT, GID_WHEEL, 0444, "sndstat");
return (sndstat_dev != 0)? 0 : ENXIO;

5
sys/dev/sr/if_sr.c
View File

@ -449,8 +449,9 @@ sr_attach(device_t device)
callout_handle_init(&sc->handle);
sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
mtx_init(&sc->xmitq.ifq_mtx, "sr_xmitq", MTX_DEF);
mtx_init(&sc->xmitq_hipri.ifq_mtx, "sr_xmitq_hipri", MTX_DEF);
mtx_init(&sc->xmitq.ifq_mtx, "sr_xmitq", NULL, MTX_DEF);
mtx_init(&sc->xmitq_hipri.ifq_mtx, "sr_xmitq_hipri", NULL,
MTX_DEF);
sc->running = 0;
#endif /* NETGRAPH */
}

3
sys/dev/ti/if_ti.c
View File

@ -1454,7 +1454,8 @@ static int ti_attach(dev)
unit = device_get_unit(dev);
bzero(sc, sizeof(struct ti_softc));
mtx_init(&sc->ti_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
mtx_init(&sc->ti_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
TI_LOCK(sc);
sc->arpcom.ac_if.if_capabilities = IFCAP_HWCSUM;
sc->arpcom.ac_if.if_capenable = sc->arpcom.ac_if.if_capabilities;

3
sys/dev/txp/if_txp.c
View File

@ -218,7 +218,8 @@ txp_attach(dev)
sc->sc_dev = dev;
sc->sc_cold = 1;
mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_DEF|MTX_RECURSE);
mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
/*
* Handle power management nonsense.

4
sys/dev/usb/if_aue.c
View File

@ -706,8 +706,8 @@ USB_ATTACH(aue)
}
}
mtx_init(&sc->aue_mtx, device_get_nameunit(self), MTX_DEF |
MTX_RECURSE);
mtx_init(&sc->aue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
AUE_LOCK(sc);
/* Reset the adapter. */

4
sys/dev/usb/if_cue.c
View File

@ -491,8 +491,8 @@ USB_ATTACH(cue)
}
}
mtx_init(&sc->cue_mtx, device_get_nameunit(self), MTX_DEF |
MTX_RECURSE);
mtx_init(&sc->cue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
CUE_LOCK(sc);
#ifdef notdef

4
sys/dev/usb/if_kue.c
View File

@ -441,8 +441,8 @@ USB_ATTACH(kue)
}
}
mtx_init(&sc->kue_mtx, device_get_nameunit(self), MTX_DEF |
MTX_RECURSE);
mtx_init(&sc->kue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
KUE_LOCK(sc);
/* Load the firmware into the NIC. */

5
sys/dev/usb/udbp.c
View File

@ -368,9 +368,10 @@ USB_ATTACH(udbp)
NG_NODE_SET_PRIVATE(sc->node, sc);
sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
mtx_init(&sc->xmitq.ifq_mtx, "usb_xmitq", MTX_DEF);
mtx_init(&sc->xmitq.ifq_mtx, "usb_xmitq", NULL,
MTX_DEF);
mtx_init(&sc->xmitq_hipri.ifq_mtx,
"usb_xmitq_hipri", MTX_DEF);
"usb_xmitq_hipri", NULL, MTX_DEF);
}
}
sc->flags = NETGRAPH_INITIALISED;

4
sys/dev/usb/usb_ethersubr.c
View File

@ -122,8 +122,8 @@ void usb_register_netisr()
if (mtx_inited)
return;
register_netisr(NETISR_USB, usbintr);
mtx_init(&usbq_tx.ifq_mtx, "usbq_tx_mtx", MTX_DEF);
mtx_init(&usbq_rx.ifq_mtx, "usbq_rx_mtx", MTX_DEF);
mtx_init(&usbq_tx.ifq_mtx, "usbq_tx_mtx", NULL, MTX_DEF);
mtx_init(&usbq_rx.ifq_mtx, "usbq_rx_mtx", NULL, MTX_DEF);
mtx_inited++;
return;
}

2
sys/dev/vinum/vinumconfig.c
View File

@ -1415,7 +1415,7 @@ config_plex(int update)
Malloc(PLEX_LOCKS * sizeof(struct rangelock));
CHECKALLOC(plex->lock, "vinum: Can't allocate lock table\n");
bzero((char *) plex->lock, PLEX_LOCKS * sizeof(struct rangelock));
mtx_init(&plex->lockmtx, plex->name, MTX_DEF);
mtx_init(&plex->lockmtx, plex->name, "plex", MTX_DEF);
}
/* Note the last plex we configured */
current_plex = plexno;

3
sys/dev/vr/if_vr.c
View File

@ -642,7 +642,8 @@ static int vr_attach(dev)
unit = device_get_unit(dev);
bzero(sc, sizeof(struct vr_softc *));
mtx_init(&sc->vr_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
mtx_init(&sc->vr_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
VR_LOCK(sc);
/*

3
sys/dev/wi/if_wi.c
View File

@ -196,7 +196,8 @@ wi_generic_attach(device_t dev)
return (error);
}
mtx_init(&sc->wi_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE);
mtx_init(&sc->wi_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
WI_LOCK(sc);
/* Reset the NIC. */

2
sys/fs/cd9660/cd9660_node.c
View File

@ -73,7 +73,7 @@ cd9660_init(vfsp)
{
isohashtbl = hashinit(desiredvnodes, M_ISOFSMNT, &isohash);
mtx_init(&cd9660_ihash_mtx, "cd9660_ihash", MTX_DEF);
mtx_init(&cd9660_ihash_mtx, "cd9660_ihash", NULL, MTX_DEF);
return (0);
}

2
sys/fs/hpfs/hpfs_hash.c
View File

@ -66,7 +66,7 @@ hpfs_hphashinit()
lockinit (&hpfs_hphash_lock, PINOD, "hpfs_hphashlock", 0, 0);
hpfs_hphashtbl = hashinit(desiredvnodes, M_HPFSHASH, &hpfs_hphash);
mtx_init(&hpfs_hphash_mtx, "hpfs hphash", MTX_DEF);
mtx_init(&hpfs_hphash_mtx, "hpfs hphash", NULL, MTX_DEF);
}
/*

2
sys/fs/hpfs/hpfs_vfsops.c
View File

@ -511,7 +511,7 @@ hpfs_vget(
vp->v_flag |= VROOT;
mtx_init(&hp->h_interlock, "hpfsnode interlock", MTX_DEF);
mtx_init(&hp->h_interlock, "hpfsnode interlock", NULL, MTX_DEF);
lockinit(&hp->h_lock, PINOD, "hpnode", VLKTIMEOUT, 0);
hp->h_flag = H_INVAL;

2
sys/fs/msdosfs/msdosfs_denode.c
View File

@ -103,7 +103,7 @@ msdosfs_init(vfsp)
struct vfsconf *vfsp;
{
dehashtbl = hashinit(desiredvnodes/2, M_MSDOSFSMNT, &dehash);
mtx_init(&dehash_mtx, "msdosfs dehash", MTX_DEF);
mtx_init(&dehash_mtx, "msdosfs dehash", NULL, MTX_DEF);
return (0);
}

2
sys/fs/ntfs/ntfs_ihash.c
View File

@ -68,7 +68,7 @@ ntfs_nthashinit()
{
lockinit(&ntfs_hashlock, PINOD, "ntfs_nthashlock", 0, 0);
ntfs_nthashtbl = hashinit(desiredvnodes, M_NTFSNTHASH, &ntfs_nthash);
mtx_init(&ntfs_nthash_mtx, "ntfs nthash", MTX_DEF);
mtx_init(&ntfs_nthash_mtx, "ntfs nthash", NULL, MTX_DEF);
}
/*

2
sys/fs/ntfs/ntfs_subr.c
View File

@ -404,7 +404,7 @@ ntfs_ntlookup(
/* init lock and lock the newborn ntnode */
lockinit(&ip->i_lock, PINOD, "ntnode", 0, LK_EXCLUSIVE);
mtx_init(&ip->i_interlock, "ntnode interlock", MTX_DEF);
mtx_init(&ip->i_interlock, "ntnode interlock", NULL, MTX_DEF);
ntfs_ntget(ip);
ntfs_nthashins(ip);

2
sys/fs/pseudofs/pseudofs.c
View File

@ -313,7 +313,7 @@ pfs_init(struct pfs_info *pi, struct vfsconf *vfc)
struct pfs_node *root;
int error;
mtx_init(&pi->pi_mutex, "pseudofs", MTX_DEF);
mtx_init(&pi->pi_mutex, "pseudofs", NULL, MTX_DEF);
/* set up the root diretory */
MALLOC(root, struct pfs_node *, sizeof *root,

2
sys/fs/pseudofs/pseudofs_fileno.c
View File

@ -61,7 +61,7 @@ struct pfs_bitmap {
void
pfs_fileno_load(void)
{
mtx_init(&pfs_fileno_mutex, "pseudofs_fileno", MTX_DEF);
mtx_init(&pfs_fileno_mutex, "pseudofs_fileno", NULL, MTX_DEF);
}
/*

3
sys/fs/pseudofs/pseudofs_vncache.c
View File

@ -78,7 +78,8 @@ extern vop_t **pfs_vnodeop_p;
void
pfs_vncache_load(void)
{
mtx_init(&pfs_vncache_mutex, "pseudofs_vncache", MTX_DEF|MTX_RECURSE);
mtx_init(&pfs_vncache_mutex, "pseudofs_vncache", NULL,
MTX_DEF | MTX_RECURSE);
/* XXX at_exit() can fail with ENOMEN */
at_exit(pfs_exit);
}

2
sys/geom/geom_event.c
View File

@ -296,5 +296,5 @@ void
g_event_init()
{
mtx_init(&g_doorlock, "GEOM orphanage", MTX_DEF);
mtx_init(&g_doorlock, "GEOM orphanage", NULL, MTX_DEF);
}

2
sys/geom/geom_io.c
View File

@ -89,7 +89,7 @@ g_bioq_init(struct g_bioq *bq)
{
TAILQ_INIT(&bq->bio_queue);
mtx_init(&bq->bio_queue_lock, "bio queue", MTX_DEF);
mtx_init(&bq->bio_queue_lock, "bio queue", NULL, MTX_DEF);
}
static struct bio *

2
sys/gnu/ext2fs/ext2_ihash.c
View File

@ -64,7 +64,7 @@ ufs_ihashinit()
{
ihashtbl = hashinit(desiredvnodes, M_UFSIHASH, &ihash);
mtx_init(&ufs_ihash_mtx, "ufs ihash", MTX_DEF);
mtx_init(&ufs_ihash_mtx, "ufs ihash", NULL, MTX_DEF);
}
/*

4
sys/i386/i386/machdep.c
View File

@ -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 */
/*

4
sys/i386/i386/mp_machdep.c
View File

@ -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();

4
sys/i386/i386/mptable.c
View File

@ -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();

2
sys/i386/i386/vm86.c
View File

@ -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;

4
sys/i386/include/mptable.h
View File

@ -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();

4
sys/i386/isa/if_el.c
View File

@ -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

2
sys/i386/isa/intr_machdep.c
View File

@ -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);

2
sys/i386/isa/nmi.c
View File

@ -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);

4
sys/i4b/capi/capi_l4if.c
View File

@ -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;

2
sys/i4b/capi/iavc/iavc_isa.c
View File

@ -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;

2
sys/i4b/capi/iavc/iavc_pci.c
View File

@ -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;

6
sys/i4b/driver/i4b_ing.c
View File

@ -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);
}
}

2
sys/i4b/driver/i4b_ipr.c
View File

@ -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;

2
sys/i4b/driver/i4b_rbch.c
View File

@ -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);

2
sys/i4b/driver/i4b_trace.c
View File

@ -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;
}

8
sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
View File

@ -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" */

8
sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
View File

@ -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" */

4
sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
View File

@ -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 */

4
sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
View File

@ -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;

4
sys/i4b/layer1/isic/i4b_bchan.c
View File

@ -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 */

4
sys/i4b/layer1/iwic/i4b_iwic_bchan.c
View File

@ -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 */

2
sys/i4b/layer2/i4b_l2.c
View File

@ -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));

2
sys/i4b/layer4/i4b_i4bdrv.c
View File

@ -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");
}

2
sys/ia64/ia64/interrupt.c
View File

@ -191,7 +191,7 @@ static void
ithds_init(void *dummy)
{
mtx_init(&ia64_intrs_lock, "ithread table lock", MTX_SPIN);
mtx_init(&ia64_intrs_lock, "ithread table lock", NULL, MTX_SPIN);
}
SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL);

2
sys/ia64/ia64/pmap.c
View File

@ -345,7 +345,7 @@ pmap_bootstrap()
pmap_steal_memory(pmap_ridmax / 8);
bzero(pmap_ridbusy, pmap_ridmax / 8);
pmap_ridbusy[0] |= 0xff;
mtx_init(&pmap_ridmutex, "RID allocator lock", MTX_DEF);
mtx_init(&pmap_ridmutex, "RID allocator lock", NULL, MTX_DEF);
/*
* Allocate some memory for initial kernel 'page tables'.

2
sys/isofs/cd9660/cd9660_node.c
View File

@ -73,7 +73,7 @@ cd9660_init(vfsp)
{
isohashtbl = hashinit(desiredvnodes, M_ISOFSMNT, &isohash);
mtx_init(&cd9660_ihash_mtx, "cd9660_ihash", MTX_DEF);
mtx_init(&cd9660_ihash_mtx, "cd9660_ihash", NULL, MTX_DEF);
return (0);
}

6
sys/kern/init_main.c
View File

@ -305,14 +305,14 @@ proc0_init(void *dummy __unused)
*/
LIST_INSERT_HEAD(&allproc, p, p_list);
LIST_INSERT_HEAD(PIDHASH(0), p, p_hash);
mtx_init(&pgrp0.pg_mtx, "process group", MTX_DEF|MTX_DUPOK);
mtx_init(&pgrp0.pg_mtx, "process group", NULL, MTX_DEF | MTX_DUPOK);
p->p_pgrp = &pgrp0;
LIST_INSERT_HEAD(PGRPHASH(0), &pgrp0, pg_hash);
LIST_INIT(&pgrp0.pg_members);
LIST_INSERT_HEAD(&pgrp0.pg_members, p, p_pglist);
pgrp0.pg_session = &session0;
mtx_init(&session0.s_mtx, "session", MTX_DEF);
mtx_init(&session0.s_mtx, "session", NULL, MTX_DEF);
session0.s_count = 1;
session0.s_leader = p;
@ -359,7 +359,7 @@ proc0_init(void *dummy __unused)
/* Create the file descriptor table. */
fdp = &filedesc0;
p->p_fd = &fdp->fd_fd;
mtx_init(&fdp->fd_fd.fd_mtx, FILEDESC_LOCK_DESC, MTX_DEF);
mtx_init(&fdp->fd_fd.fd_mtx, FILEDESC_LOCK_DESC, NULL, MTX_DEF);
fdp->fd_fd.fd_refcnt = 1;
fdp->fd_fd.fd_cmask = cmask;
fdp->fd_fd.fd_ofiles = fdp->fd_dfiles;

4
sys/kern/kern_descrip.c
View File

@ -1167,7 +1167,7 @@ fdinit(td)
MALLOC(newfdp, struct filedesc0 *, sizeof(struct filedesc0),
M_FILEDESC, M_WAITOK | M_ZERO);
mtx_init(&newfdp->fd_fd.fd_mtx, FILEDESC_LOCK_DESC, MTX_DEF);
mtx_init(&newfdp->fd_fd.fd_mtx, FILEDESC_LOCK_DESC, NULL, MTX_DEF);
FILEDESC_LOCK(&newfdp->fd_fd);
newfdp->fd_fd.fd_cdir = fdp->fd_cdir;
if (newfdp->fd_fd.fd_cdir)
@ -1228,7 +1228,7 @@ fdcopy(td)
bcopy(fdp, newfdp, sizeof(struct filedesc));
FILEDESC_UNLOCK(fdp);
bzero(&newfdp->fd_mtx, sizeof(newfdp->fd_mtx));
mtx_init(&newfdp->fd_mtx, FILEDESC_LOCK_DESC, MTX_DEF);
mtx_init(&newfdp->fd_mtx, FILEDESC_LOCK_DESC, NULL, MTX_DEF);
if (newfdp->fd_cdir)
VREF(newfdp->fd_cdir);
if (newfdp->fd_rdir)

2
sys/kern/kern_fork.c
View File

@ -464,7 +464,7 @@ again:
*/
proc_linkup(p2, kg2, ke2, td2);
mtx_init(&p2->p_mtx, "process lock", MTX_DEF|MTX_DUPOK);
mtx_init(&p2->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK);
PROC_LOCK(p2);
/* note.. XXXKSE no pcb or u-area yet */

2
sys/kern/kern_intr.c
View File

@ -183,7 +183,7 @@ ithread_create(struct ithd **ithread, int vector, int flags,
ithd->it_enable = enable;
ithd->it_flags = flags;
TAILQ_INIT(&ithd->it_handlers);
mtx_init(&ithd->it_lock, "ithread", MTX_DEF);
mtx_init(&ithd->it_lock, "ithread", NULL, MTX_DEF);
mtx_lock(&ithd->it_lock);
va_start(ap, fmt);

2
sys/kern/kern_jail.c
View File

@ -74,7 +74,7 @@ jail(td, uap)
mtx_lock(&Giant);
MALLOC(pr, struct prison *, sizeof *pr , M_PRISON, M_WAITOK | M_ZERO);
mtx_init(&pr->pr_mtx, "jail mutex", MTX_DEF);
mtx_init(&pr->pr_mtx, "jail mutex", NULL, MTX_DEF);
pr->pr_securelevel = securelevel;
error = copyinstr(j.hostname, &pr->pr_host, sizeof pr->pr_host, 0);
if (error)

4
sys/kern/kern_lock.c
View File

@ -89,7 +89,7 @@ lockmgr_init(void *dummy __unused)
* initialized in a call to lockinit().
*/
if (lock_mtx_valid == 0) {
mtx_init(&lock_mtx, "lockmgr", MTX_DEF);
mtx_init(&lock_mtx, "lockmgr", NULL, MTX_DEF);
lock_mtx_valid = 1;
}
}
@ -496,7 +496,7 @@ lockinit(lkp, prio, wmesg, timo, flags)
"timo == %d, flags = 0x%x\n", lkp, prio, wmesg, timo, flags);
if (lock_mtx_valid == 0) {
mtx_init(&lock_mtx, "lockmgr", MTX_DEF);
mtx_init(&lock_mtx, "lockmgr", NULL, MTX_DEF);
lock_mtx_valid = 1;
}
/*

2
sys/kern/kern_malloc.c
View File

@ -325,7 +325,7 @@ kmeminit(dummy)
int bits;
int i;
mtx_init(&malloc_mtx, "malloc", MTX_DEF);
mtx_init(&malloc_mtx, "malloc", NULL, MTX_DEF);
/*
* Try to auto-tune the kernel memory size, so that it is

2
sys/kern/kern_mtxpool.c
View File

@ -63,7 +63,7 @@ mtx_pool_setup(void *dummy __unused)
int i;
for (i = 0; i < MTX_POOL_SIZE; ++i)
mtx_init(&mtx_pool_ary[i], "pool mutex", MTX_DEF | MTX_NOWITNESS | MTX_QUIET);
mtx_init(&mtx_pool_ary[i], "pool mutex", NULL, MTX_DEF | MTX_NOWITNESS | MTX_QUIET);
mtx_pool_valid = 1;
}

6
sys/kern/kern_proc.c
View File

@ -96,7 +96,7 @@ procinit()
sx_init(&allproc_lock, "allproc");
sx_init(&proctree_lock, "proctree");
sx_init(&pgrpsess_lock, "pgrpsess");
mtx_init(&pargs_ref_lock, "struct pargs.ref", MTX_DEF);
mtx_init(&pargs_ref_lock, "struct pargs.ref", NULL, MTX_DEF);
LIST_INIT(&allproc);
LIST_INIT(&zombproc);
pidhashtbl = hashinit(maxproc / 4, M_PROC, &pidhash);
@ -344,13 +344,13 @@ enterpgrp(p, pgid, pgrp, sess)
KASSERT(!SESS_LEADER(p),
("enterpgrp: session leader attempted setpgrp"));
mtx_init(&pgrp->pg_mtx, "process group", MTX_DEF|MTX_DUPOK);
mtx_init(&pgrp->pg_mtx, "process group", NULL, MTX_DEF | MTX_DUPOK);
if (sess != NULL) {
/*
* new session
*/
mtx_init(&sess->s_mtx, "session", MTX_DEF);
mtx_init(&sess->s_mtx, "session", NULL, MTX_DEF);
PROC_LOCK(p);
p->p_flag &= ~P_CONTROLT;
PROC_UNLOCK(p);

Some files were not shown because too many files have changed in this diff Show More