diff options
Diffstat (limited to 'sys')
162 files changed, 274 insertions, 239 deletions
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c index 58a31c0..119d89b 100644 --- a/sys/alpha/alpha/busdma_machdep.c +++ b/sys/alpha/alpha/busdma_machdep.c @@ -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); diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c index b1fe3e1..db59dc7 100644 --- a/sys/alpha/alpha/interrupt.c +++ b/sys/alpha/alpha/interrupt.c @@ -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); diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index 2319780..a8b1abf 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -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. diff --git a/sys/alpha/alpha/mp_machdep.c b/sys/alpha/alpha/mp_machdep.c index 85922be..10ef1ac 100644 --- a/sys/alpha/alpha/mp_machdep.c +++ b/sys/alpha/alpha/mp_machdep.c @@ -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; diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c index 37ac2a5..ab4b253 100644 --- a/sys/alpha/alpha/pmap.c +++ b/sys/alpha/alpha/pmap.c @@ -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); } diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index c8b7c5e..a3c653c 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/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/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 50c91c7..2b5ac5a 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/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/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 50c91c7..2b5ac5a 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/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/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 50c91c7..2b5ac5a 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/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/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index 59c739e..cfd6c69 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/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/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index 59c739e..cfd6c69 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/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); diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h index a4af5da..7e8e473 100644 --- a/sys/dev/aac/aacvar.h +++ b/sys/dev/aac/aacvar.h @@ -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 diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c index e3aebc2..82bcdd0 100644 --- a/sys/dev/acpica/Osd/OsdSchedule.c +++ b/sys/dev/acpica/Osd/OsdSchedule.c @@ -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, diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c index b21362a..2cd0daf 100644 --- a/sys/dev/acpica/Osd/OsdSynch.c +++ b/sys/dev/acpica/Osd/OsdSynch.c @@ -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; diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 475b6a1..4d03e00 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -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. diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c index 826d069..069a82b 100644 --- a/sys/dev/an/if_an.c +++ b/sys/dev/an/if_an.c @@ -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; diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c index 3f7a922..7af27c2 100644 --- a/sys/dev/ar/if_ar.c +++ b/sys/dev/ar/if_ar.c @@ -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 */ } diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index fa8cd2e..540e8a6 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -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); /* diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 7fc36ba..fbbed2c 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -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(); diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h index b2ae9b2..d18ca39 100644 --- a/sys/dev/fxp/if_fxpvar.h +++ b/sys/dev/fxp/if_fxpvar.h @@ -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 diff --git a/sys/dev/gx/if_gx.c b/sys/dev/gx/if_gx.c index 0e44a73..0ac3b71 100644 --- a/sys/dev/gx/if_gx.c +++ b/sys/dev/gx/if_gx.c @@ -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); diff --git a/sys/dev/gx/if_gxvar.h b/sys/dev/gx/if_gxvar.h index 6c5f9ab..a6f7364 100644 --- a/sys/dev/gx/if_gxvar.h +++ b/sys/dev/gx/if_gxvar.h @@ -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 diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c index c310546..6c8f8f5 100644 --- a/sys/dev/ichsmb/ichsmb.c +++ b/sys/dev/ichsmb/ichsmb.c @@ -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); } diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index e53b0eb..65aa923 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -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 diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c index 2e13f16..e9af2f6 100644 --- a/sys/dev/lmc/if_lmc.c +++ b/sys/dev/lmc/if_lmc.c @@ -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; /* diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c index 7c7667c..32b1752 100644 --- a/sys/dev/nge/if_nge.c +++ b/sys/dev/nge/if_nge.c @@ -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. diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index 8b50aa9..077aa9f 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -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; diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c index 5a9a4a1..6510e74 100644 --- a/sys/dev/pdq/pdq_ifsubr.c +++ b/sys/dev/pdq/pdq_ifsubr.c @@ -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; diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c index 8ab16b2..dd79c34 100644 --- a/sys/dev/random/yarrow.c +++ b/sys/dev/random/yarrow.c @@ -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 diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index 771e69e..6322a3b 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -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. diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 0c434cb..60be206 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -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); } diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index 6c39da2..3a6cb4f 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -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); /* diff --git a/sys/dev/sound/isa/emu8000.c b/sys/dev/sound/isa/emu8000.c index 73ac39f..2442e2b 100644 --- a/sys/dev/sound/isa/emu8000.c +++ b/sys/dev/sound/isa/emu8000.c @@ -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. */ diff --git a/sys/dev/sound/isa/gusmidi.c b/sys/dev/sound/isa/gusmidi.c index 37c99cc..e5788d1 100644 --- a/sys/dev/sound/isa/gusmidi.c +++ b/sys/dev/sound/isa/gusmidi.c @@ -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. */ diff --git a/sys/dev/sound/isa/mpu.c b/sys/dev/sound/isa/mpu.c index f66466f..4f1f034 100644 --- a/sys/dev/sound/isa/mpu.c +++ b/sys/dev/sound/isa/mpu.c @@ -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)) { diff --git a/sys/dev/sound/isa/opl.c b/sys/dev/sound/isa/opl.c index 6ee4e96..21eb453 100644 --- a/sys/dev/sound/isa/opl.c +++ b/sys/dev/sound/isa/opl.c @@ -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; diff --git a/sys/dev/sound/isa/uartsio.c b/sys/dev/sound/isa/uartsio.c index 6554247..4170aeb 100644 --- a/sys/dev/sound/isa/uartsio.c +++ b/sys/dev/sound/isa/uartsio.c @@ -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. */ diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 8b6e2a7..07d2660 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -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); diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c index fa9f285..5115cc9 100644 --- a/sys/dev/sound/midi/sequencer.c +++ b/sys/dev/sound/midi/sequencer.c @@ -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); diff --git a/sys/dev/sound/midi/timer.c b/sys/dev/sound/midi/timer.c index 969153e..ba4bce0 100644 --- a/sys/dev/sound/midi/timer.c +++ b/sys/dev/sound/midi/timer.c @@ -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); } diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index a0dd70c..be36048 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -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. */ diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index ae94737..5ff2080 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -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; diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c index 1d9958e..7d30e67 100644 --- a/sys/dev/sr/if_sr.c +++ b/sys/dev/sr/if_sr.c @@ -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 */ } diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index 7926105..17f5a00 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -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; diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c index d1535ae..1ac9a67 100644 --- a/sys/dev/txp/if_txp.c +++ b/sys/dev/txp/if_txp.c @@ -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. diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index cffc54b..0694091 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -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. */ diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 3a47790..6fc8010 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -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 diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index f7e1134..745581a 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -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. */ diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c index 15ca63e..1c903894 100644 --- a/sys/dev/usb/udbp.c +++ b/sys/dev/usb/udbp.c @@ -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; diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c index 395ea6f..100d93a 100644 --- a/sys/dev/usb/usb_ethersubr.c +++ b/sys/dev/usb/usb_ethersubr.c @@ -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; } diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c index e1d7d0e..c3b9fd5 100644 --- a/sys/dev/vinum/vinumconfig.c +++ b/sys/dev/vinum/vinumconfig.c @@ -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; diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c index 33a6897..5c15aae 100644 --- a/sys/dev/vr/if_vr.c +++ b/sys/dev/vr/if_vr.c @@ -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); /* diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c index 8fc815f..7038335 100644 --- a/sys/dev/wi/if_wi.c +++ b/sys/dev/wi/if_wi.c @@ -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. */ diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c index 8371246..e837f76 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -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); } diff --git a/sys/fs/hpfs/hpfs_hash.c b/sys/fs/hpfs/hpfs_hash.c index 0a04a9a..2b6e74b 100644 --- a/sys/fs/hpfs/hpfs_hash.c +++ b/sys/fs/hpfs/hpfs_hash.c @@ -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); } /* diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c index 05ae373..7550842 100644 --- a/sys/fs/hpfs/hpfs_vfsops.c +++ b/sys/fs/hpfs/hpfs_vfsops.c @@ -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; diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 3a24b7c..7a0cf79 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -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); } diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c index 89363f9..cb557f2 100644 --- a/sys/fs/ntfs/ntfs_ihash.c +++ b/sys/fs/ntfs/ntfs_ihash.c @@ -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); } /* diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c index dd9af4e..afb1862 100644 --- a/sys/fs/ntfs/ntfs_subr.c +++ b/sys/fs/ntfs/ntfs_subr.c @@ -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); diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index 6477bff..5b9a24f 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -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, diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c index 778ef1b..223ca9b 100644 --- a/sys/fs/pseudofs/pseudofs_fileno.c +++ b/sys/fs/pseudofs/pseudofs_fileno.c @@ -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); } /* diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c index 00822f1..62ba7e0 100644 --- a/sys/fs/pseudofs/pseudofs_vncache.c +++ b/sys/fs/pseudofs/pseudofs_vncache.c @@ -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); } diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c index f565d14..6f1eb0d 100644 --- a/sys/geom/geom_event.c +++ b/sys/geom/geom_event.c @@ -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); } diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index b070448..99e824d 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -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 * diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c index d31add3..eda2ab4 100644 --- a/sys/gnu/ext2fs/ext2_ihash.c +++ b/sys/gnu/ext2fs/ext2_ihash.c @@ -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); } /* 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); 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"); } diff --git a/sys/ia64/ia64/interrupt.c b/sys/ia64/ia64/interrupt.c index 5afe99c..a7483a5 100644 --- a/sys/ia64/ia64/interrupt.c +++ b/sys/ia64/ia64/interrupt.c @@ -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); diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c index 14a6276..9ba5d8f 100644 --- a/sys/ia64/ia64/pmap.c +++ b/sys/ia64/ia64/pmap.c @@ -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'. diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index 8371246..e837f76 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -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); } diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index afad11d..4f0aa45 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -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; diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index b97386d..034aba9 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -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) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index ec959d5..877d8a7 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -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 */ diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 23ca98f..4020a19 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -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); diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index aae12be..2cbe24c 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -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) diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index d9d61c2..fddfd26 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -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; } /* diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index e249e5b..d2806fd 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -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 diff --git a/sys/kern/kern_mtxpool.c b/sys/kern/kern_mtxpool.c index f0f1208..3d4aa1c 100644 --- a/sys/kern/kern_mtxpool.c +++ b/sys/kern/kern_mtxpool.c @@ -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; } diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 7e62eff..3d9cb06 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -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); diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 26349bd..c054acf 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -827,7 +827,7 @@ uihashinit() { uihashtbl = hashinit(maxproc / 16, M_UIDINFO, &uihash); - mtx_init(&uihashtbl_mtx, "uidinfo hash", MTX_DEF); + mtx_init(&uihashtbl_mtx, "uidinfo hash", NULL, MTX_DEF); } /* diff --git a/sys/kern/kern_sema.c b/sys/kern/kern_sema.c index cb47ba9..61435bd 100644 --- a/sys/kern/kern_sema.c +++ b/sys/kern/kern_sema.c @@ -50,7 +50,7 @@ sema_init(struct sema *sema, int value, const char *description) KASSERT((value >= 0), ("%s(): negative value\n", __func__)); bzero(sema, sizeof(*sema)); - mtx_init(&sema->sema_mtx, "sema backing lock", + mtx_init(&sema->sema_mtx, description, "sema backing lock", MTX_DEF | MTX_NOWITNESS | MTX_QUIET); cv_init(&sema->sema_cv, description); sema->sema_value = value; diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index d907e83..937b0c2 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -107,7 +107,7 @@ kern_timeout_callwheel_init(void) for (i = 0; i < callwheelsize; i++) { TAILQ_INIT(&callwheel[i]); } - mtx_init(&callout_lock, "callout", MTX_SPIN | MTX_RECURSE); + mtx_init(&callout_lock, "callout", NULL, MTX_SPIN | MTX_RECURSE); } /* diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index d69e906..8a7b70e 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -58,7 +58,7 @@ static void dksort_init(void) { - mtx_init(&dksort_mtx, "dksort", MTX_DEF); + mtx_init(&dksort_mtx, "dksort", NULL, MTX_DEF); } SYSINIT(dksort, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dksort_init, NULL) diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c index 0a64ff1..45b4302 100644 --- a/sys/kern/subr_eventhandler.c +++ b/sys/kern/subr_eventhandler.c @@ -55,7 +55,7 @@ static void eventhandler_init(void *dummy __unused) { TAILQ_INIT(&eventhandler_lists); - mtx_init(&eventhandler_mutex, "eventhandler", MTX_DEF | MTX_RECURSE); + mtx_init(&eventhandler_mutex, "eventhandler", NULL, MTX_DEF | MTX_RECURSE); eventhandler_lists_initted = 1; } SYSINIT(eventhandlers, SI_SUB_EVENTHANDLER, SI_ORDER_FIRST, eventhandler_init, diff --git a/sys/kern/subr_mbuf.c b/sys/kern/subr_mbuf.c index da86199..008dea5 100644 --- a/sys/kern/subr_mbuf.c +++ b/sys/kern/subr_mbuf.c @@ -368,7 +368,7 @@ mbuf_init(void *dummy) /* * Initialize condition variables and general container mutex locks. */ - mtx_init(&mbuf_gen, "mbuf subsystem general lists lock", 0); + mtx_init(&mbuf_gen, "mbuf subsystem general lists lock", NULL, 0); cv_init(&(mb_list_mbuf.ml_genlist->mgl_mstarved), "mbuf pool starved"); cv_init(&(mb_list_clust.ml_genlist->mgl_mstarved), "mcluster pool starved"); @@ -421,7 +421,7 @@ mbuf_init(void *dummy) (mb_list_clust.ml_cntlst[i] == NULL)) goto bad; - mtx_init(&mbuf_pcpu[i], "mbuf PCPU list lock", 0); + mtx_init(&mbuf_pcpu[i], "mbuf PCPU list lock", NULL, 0); mb_list_mbuf.ml_cntlst[i]->mb_cont.mc_lock = mb_list_clust.ml_cntlst[i]->mb_cont.mc_lock = &mbuf_pcpu[i]; diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c index 119a967..85af088 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -90,7 +90,7 @@ rman_init(struct rman *rm) if (once == 0) { once = 1; TAILQ_INIT(&rman_head); - mtx_init(&rman_mtx, "rman head", MTX_DEF); + mtx_init(&rman_mtx, "rman head", NULL, MTX_DEF); } if (rm->rm_type == RMAN_UNINIT) @@ -102,7 +102,7 @@ rman_init(struct rman *rm) rm->rm_mtx = malloc(sizeof *rm->rm_mtx, M_RMAN, M_NOWAIT | M_ZERO); if (rm->rm_mtx == 0) return ENOMEM; - mtx_init(rm->rm_mtx, "rman", MTX_DEF); + mtx_init(rm->rm_mtx, "rman", NULL, MTX_DEF); mtx_lock(&rman_mtx); TAILQ_INSERT_TAIL(&rman_head, rm, rm_link); diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 34df61d..77d0df4 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -105,7 +105,7 @@ mp_start(void *dummy) if (mp_probe_status == 0) return; - mtx_init(&smp_rv_mtx, "smp rendezvous", MTX_SPIN); + mtx_init(&smp_rv_mtx, "smp rendezvous", NULL, MTX_SPIN); cpu_mp_start(); printf("FreeBSD/SMP: Multiprocessor System Detected: %d CPUs\n", mp_ncpus); diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c index 72afa6b..19a93ad 100644 --- a/sys/kern/subr_taskqueue.c +++ b/sys/kern/subr_taskqueue.c @@ -59,7 +59,7 @@ static void init_taskqueue_list(void *data __unused) { - mtx_init(&taskqueue_queues_mutex, "taskqueue list", MTX_DEF); + mtx_init(&taskqueue_queues_mutex, "taskqueue list", NULL, MTX_DEF); STAILQ_INIT(&taskqueue_queues); } SYSINIT(taskqueue_list, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_taskqueue_list, @@ -80,7 +80,7 @@ taskqueue_create(const char *name, int mflags, queue->tq_enqueue = enqueue; queue->tq_context = context; queue->tq_draining = 0; - mtx_init(&queue->tq_mutex, "taskqueue", MTX_DEF); + mtx_init(&queue->tq_mutex, "taskqueue", NULL, MTX_DEF); mtx_lock(&taskqueue_queues_mutex); STAILQ_INSERT_TAIL(&taskqueue_queues, queue, tq_link); diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 196be5a..4ce45b1 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1221,5 +1221,5 @@ selectinit(dummy) void *dummy; { cv_init(&selwait, "select"); - mtx_init(&sellock, "sellck", MTX_DEF); + mtx_init(&sellock, "sellck", NULL, MTX_DEF); } diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 56b2c56..8699ca2 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -265,7 +265,7 @@ pipe(td, uap) td->td_retval[1] = fd; rpipe->pipe_peer = wpipe; wpipe->pipe_peer = rpipe; - mtx_init(pmtx, "pipe mutex", MTX_DEF | MTX_RECURSE); + mtx_init(pmtx, "pipe mutex", NULL, MTX_DEF | MTX_RECURSE); rpipe->pipe_mtxp = wpipe->pipe_mtxp = pmtx; fdrop(rf, td); diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index b4d98d4..56b8fee 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1552,7 +1552,7 @@ sf_buf_init(void *arg) { int i; - mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", MTX_DEF); + mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); mtx_lock(&sf_freelist.sf_lock); SLIST_INIT(&sf_freelist.sf_head); sf_base = kmem_alloc_pageable(kernel_map, nsfbufs * PAGE_SIZE); diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index a81136a..7c4fd8e 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -484,7 +484,7 @@ bufinit(void) GIANT_REQUIRED; LIST_INIT(&invalhash); - mtx_init(&buftimelock, "buftime lock", MTX_DEF); + mtx_init(&buftimelock, "buftime lock", NULL, MTX_DEF); for (i = 0; i <= bufhashmask; i++) LIST_INIT(&bufhashtbl[i]); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 7967b04..a48b138 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -258,7 +258,7 @@ void v_addpollinfo(struct vnode *vp) { vp->v_pollinfo = uma_zalloc(vnodepoll_zone, M_WAITOK); - mtx_init(&vp->v_pollinfo->vpi_lock, "vnode pollinfo", MTX_DEF); + mtx_init(&vp->v_pollinfo->vpi_lock, "vnode pollinfo", NULL, MTX_DEF); } /* @@ -270,12 +270,12 @@ vntblinit(void *dummy __unused) desiredvnodes = maxproc + cnt.v_page_count / 4; minvnodes = desiredvnodes / 4; - mtx_init(&mountlist_mtx, "mountlist", MTX_DEF); - mtx_init(&mntvnode_mtx, "mntvnode", MTX_DEF); - mtx_init(&mntid_mtx, "mntid", MTX_DEF); - mtx_init(&spechash_mtx, "spechash", MTX_DEF); + mtx_init(&mountlist_mtx, "mountlist", NULL, MTX_DEF); + mtx_init(&mntvnode_mtx, "mntvnode", NULL, MTX_DEF); + mtx_init(&mntid_mtx, "mntid", NULL, MTX_DEF); + mtx_init(&spechash_mtx, "spechash", NULL, MTX_DEF); TAILQ_INIT(&vnode_free_list); - mtx_init(&vnode_free_list_mtx, "vnode_free_list", MTX_DEF); + mtx_init(&vnode_free_list_mtx, "vnode_free_list", NULL, MTX_DEF); vnode_zone = uma_zcreate("VNODE", sizeof (struct vnode), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); vnodepoll_zone = uma_zcreate("VNODEPOLL", sizeof (struct vpollinfo), @@ -888,7 +888,7 @@ getnewvnode(tag, mp, vops, vpp) mtx_unlock(&vnode_free_list_mtx); vp = (struct vnode *) uma_zalloc(vnode_zone, M_WAITOK); bzero((char *) vp, sizeof *vp); - mtx_init(&vp->v_interlock, "vnode interlock", MTX_DEF); + mtx_init(&vp->v_interlock, "vnode interlock", NULL, MTX_DEF); vp->v_dd = vp; cache_purge(vp); LIST_INIT(&vp->v_cache_src); diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 8ce7d3e..0077e51 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -343,7 +343,7 @@ bpfopen(dev, flags, fmt, td) d->bd_bufsize = bpf_bufsize; d->bd_sig = SIGIO; d->bd_seesent = 1; - mtx_init(&d->bd_mtx, devtoname(dev), MTX_DEF); + mtx_init(&d->bd_mtx, devtoname(dev), "bpf cdev lock", MTX_DEF); callout_init(&d->bd_callout, 1); return (0); @@ -1263,7 +1263,7 @@ bpfattach(ifp, dlt, hdrlen) bp->bif_ifp = ifp; bp->bif_dlt = dlt; - mtx_init(&bp->bif_mtx, "bpf interface lock", MTX_DEF); + mtx_init(&bp->bif_mtx, "bpf interface lock", NULL, MTX_DEF); mtx_lock(&bpf_mtx); bp->bif_next = bpf_iflist; @@ -1362,7 +1362,7 @@ bpf_drvinit(unused) void *unused; { - mtx_init(&bpf_mtx, "bpf global lock", MTX_DEF); + mtx_init(&bpf_mtx, "bpf global lock", NULL, MTX_DEF); EVENTHANDLER_REGISTER(dev_clone, bpf_clone, 0, 1000); cdevsw_add(&bpf_cdevsw); } diff --git a/sys/net/if.c b/sys/net/if.c index 4b8573f..854a879 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -301,7 +301,8 @@ if_check(dummy) if (!mtx_initialized(&ifp->if_snd.ifq_mtx)) { printf("%s%d XXX: driver didn't initialize queue mtx\n", ifp->if_name, ifp->if_unit); - mtx_init(&ifp->if_snd.ifq_mtx, "unknown", MTX_DEF); + mtx_init(&ifp->if_snd.ifq_mtx, "unknown", + MTX_NETWORK_LOCK, MTX_DEF); } } splx(s); @@ -398,7 +399,7 @@ if_attach(ifp) make_dev_alias(ifdev_byindex(ifp->if_index), "%s%d", net_cdevsw.d_name, ifp->if_index); - mtx_init(&ifp->if_snd.ifq_mtx, ifp->if_name, MTX_DEF); + mtx_init(&ifp->if_snd.ifq_mtx, ifp->if_name, "if send queue", MTX_DEF); /* * create a Link Level name for this device diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index eb90809..eb5f072 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -208,9 +208,9 @@ pppattach(void) sc->sc_inq.ifq_maxlen = IFQ_MAXLEN; sc->sc_fastq.ifq_maxlen = IFQ_MAXLEN; sc->sc_rawq.ifq_maxlen = IFQ_MAXLEN; - mtx_init(&sc->sc_inq.ifq_mtx, "ppp_inq", MTX_DEF); - mtx_init(&sc->sc_fastq.ifq_mtx, "ppp_fastq", MTX_DEF); - mtx_init(&sc->sc_rawq.ifq_mtx, "ppp_rawq", MTX_DEF); + mtx_init(&sc->sc_inq.ifq_mtx, "ppp_inq", NULL, MTX_DEF); + mtx_init(&sc->sc_fastq.ifq_mtx, "ppp_fastq", NULL, MTX_DEF); + mtx_init(&sc->sc_rawq.ifq_mtx, "ppp_rawq", NULL, MTX_DEF); if_attach(&sc->sc_if); bpfattach(&sc->sc_if, DLT_PPP, PPP_HDRLEN); } diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index 687e9bb..cae7915 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -304,7 +304,7 @@ slcreate() sc->sc_fastq.ifq_maxlen = 32; sc->sc_if.if_linkmib = sc; sc->sc_if.if_linkmiblen = sizeof *sc; - mtx_init(&sc->sc_fastq.ifq_mtx, "sl_fastq", MTX_DEF); + mtx_init(&sc->sc_fastq.ifq_mtx, "sl_fastq", NULL, MTX_DEF); /* * Find a suitable unit number. diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 600179e..807cdb5 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1023,9 +1023,9 @@ sppp_attach(struct ifnet *ifp) sp->pp_up = lcp.Up; sp->pp_down = lcp.Down; if(!mtx_initialized(&sp->pp_cpq.ifq_mtx)) - mtx_init(&sp->pp_cpq.ifq_mtx, "sppp_cpq", MTX_DEF); + mtx_init(&sp->pp_cpq.ifq_mtx, "sppp_cpq", NULL, MTX_DEF); if(!mtx_initialized(&sp->pp_fastq.ifq_mtx)) - mtx_init(&sp->pp_fastq.ifq_mtx, "sppp_fastq", MTX_DEF); + mtx_init(&sp->pp_fastq.ifq_mtx, "sppp_fastq", NULL, MTX_DEF); sp->pp_last_recv = sp->pp_last_sent = time_second; sp->confflags = 0; #ifdef INET diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c index 48e17d4..fa79cec 100644 --- a/sys/netatalk/ddp_pcb.c +++ b/sys/netatalk/ddp_pcb.c @@ -550,8 +550,8 @@ ddp_init(void ) atintrq2.ifq_maxlen = IFQ_MAXLEN; atintrq1_present = 1; atintrq2_present = 1; - mtx_init(&atintrq1.ifq_mtx, "at1_inq", MTX_DEF); - mtx_init(&atintrq2.ifq_mtx, "at2_inq", MTX_DEF); + mtx_init(&atintrq1.ifq_mtx, "at1_inq", NULL, MTX_DEF); + mtx_init(&atintrq2.ifq_mtx, "at2_inq", NULL, MTX_DEF); } #if 0 diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c index 48e17d4..fa79cec 100644 --- a/sys/netatalk/ddp_usrreq.c +++ b/sys/netatalk/ddp_usrreq.c @@ -550,8 +550,8 @@ ddp_init(void ) atintrq2.ifq_maxlen = IFQ_MAXLEN; atintrq1_present = 1; atintrq2_present = 1; - mtx_init(&atintrq1.ifq_mtx, "at1_inq", MTX_DEF); - mtx_init(&atintrq2.ifq_mtx, "at2_inq", MTX_DEF); + mtx_init(&atintrq1.ifq_mtx, "at1_inq", NULL, MTX_DEF); + mtx_init(&atintrq2.ifq_mtx, "at2_inq", NULL, MTX_DEF); } #if 0 diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c index 0ebfed8..b16f787 100644 --- a/sys/netatm/atm_subr.c +++ b/sys/netatm/atm_subr.c @@ -134,7 +134,7 @@ atm_initialize() atm_init = 1; atm_intrq.ifq_maxlen = ATM_INTRQ_MAX; - mtx_init(&atm_intrq.ifq_mtx, "atm_inq", MTX_DEF); + mtx_init(&atm_intrq.ifq_mtx, "atm_inq", NULL, MTX_DEF); atmintrq_present = 1; #ifdef sgi diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index 6acea35..aa392c7 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -616,7 +616,7 @@ ng_make_node_common(struct ng_type *type, node_p *nodepp) NG_NODE_REF(node); /* note reference */ type->refs++; - mtx_init(&node->nd_input_queue.q_mtx, "ng_node", MTX_SPIN); + mtx_init(&node->nd_input_queue.q_mtx, "ng_node", NULL, MTX_SPIN); node->nd_input_queue.queue = NULL; node->nd_input_queue.last = &node->nd_input_queue.queue; node->nd_input_queue.q_flags = 0; @@ -2981,11 +2981,11 @@ ngb_mod_event(module_t mod, int event, void *data) switch (event) { case MOD_LOAD: /* Register line discipline */ - mtx_init(&ng_worklist_mtx, "ng_worklist", MTX_SPIN); - mtx_init(&ng_typelist_mtx, "netgraph types mutex", 0); - mtx_init(&ng_nodelist_mtx, "netgraph nodelist mutex", 0); - mtx_init(&ng_idhash_mtx, "netgraph idhash mutex", 0); - mtx_init(&ngq_mtx, "netgraph netisr mutex", 0); + mtx_init(&ng_worklist_mtx, "ng_worklist", NULL, MTX_SPIN); + mtx_init(&ng_typelist_mtx, "netgraph types mutex", NULL, 0); + mtx_init(&ng_nodelist_mtx, "netgraph nodelist mutex", NULL, 0); + mtx_init(&ng_idhash_mtx, "netgraph idhash mutex", NULL, 0); + mtx_init(&ngq_mtx, "netgraph netisr mutex", NULL, 0); s = splimp(); error = register_netisr(NETISR_NETGRAPH, ngintr); splx(s); diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 1bd85a3..6a87a5e 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -942,7 +942,7 @@ arp_init(void) { arpintrq.ifq_maxlen = 50; - mtx_init(&arpintrq.ifq_mtx, "arp_inq", MTX_DEF); + mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); } SYSINIT(arp, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, arp_init, 0); diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 9d2b019..b720bdd 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -253,7 +253,7 @@ ip_init() ip_id = time_second & 0xffff; #endif ipintrq.ifq_maxlen = ipqmaxlen; - mtx_init(&ipintrq.ifq_mtx, "ip_inq", MTX_DEF); + mtx_init(&ipintrq.ifq_mtx, "ip_inq", NULL, MTX_DEF); ipintrq_present = 1; register_netisr(NETISR_IP, ipintr); diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index d29bcae..eb95fe8 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -180,7 +180,7 @@ ip6_init() pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) ip6_protox[pr->pr_protocol] = pr - inet6sw; ip6intrq.ifq_maxlen = ip6qmaxlen; - mtx_init(&ip6intrq.ifq_mtx, "ip6_inq", MTX_DEF); + mtx_init(&ip6intrq.ifq_mtx, "ip6_inq", NULL, MTX_DEF); ip6intrq_present = 1; register_netisr(NETISR_IPV6, ip6intr); nd6_init(); diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c index d912bdc..3410a41 100644 --- a/sys/netipx/ipx_input.c +++ b/sys/netipx/ipx_input.c @@ -106,7 +106,7 @@ ipx_init() read_random(&ipx_pexseq, sizeof ipx_pexseq); ipxintrq.ifq_maxlen = ipxqmaxlen; - mtx_init(&ipxintrq.ifq_mtx, "ipx_inq", MTX_DEF); + mtx_init(&ipxintrq.ifq_mtx, "ipx_inq", NULL, MTX_DEF); ipxintrq_present = 1; ipxpcb.ipxp_next = ipxpcb.ipxp_prev = &ipxpcb; ipxrawpcb.ipxp_next = ipxrawpcb.ipxp_prev = &ipxrawpcb; diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c index 6222799..c3612c0 100644 --- a/sys/netnatm/natm_proto.c +++ b/sys/netnatm/natm_proto.c @@ -121,7 +121,7 @@ void natm_init() LIST_INIT(&natm_pcbs); bzero(&natmintrq, sizeof(natmintrq)); natmintrq.ifq_maxlen = natmqmaxlen; - mtx_init(&natmintrq.ifq_mtx, "natm_inq", MTX_DEF); + mtx_init(&natmintrq.ifq_mtx, "natm_inq", NULL, MTX_DEF); natmintrq_present = 1; } diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c index 7006540..22abe02 100644 --- a/sys/netns/ns_input.c +++ b/sys/netns/ns_input.c @@ -88,7 +88,7 @@ ns_init() nspcb.nsp_next = nspcb.nsp_prev = &nspcb; nsrawpcb.nsp_next = nsrawpcb.nsp_prev = &nsrawpcb; nsintrq.ifq_maxlen = nsqmaxlen; - mtx_init(&nsintrq.ifq_mtx, "ns_inq", MTX_DEF); + mtx_init(&nsintrq.ifq_mtx, "ns_inq", NULL, MTX_DEF); nsintrq_present = 1; ns_pexseq = time.tv_usec; ns_netmask.sns_len = 6; diff --git a/sys/netsmb/smb_subr.h b/sys/netsmb/smb_subr.h index b1696e6..337193f 100644 --- a/sys/netsmb/smb_subr.h +++ b/sys/netsmb/smb_subr.h @@ -79,7 +79,7 @@ void m_dumpm(struct mbuf *m); #include <sys/mutex.h> #define smb_slock mtx -#define smb_sl_init(mtx, desc) mtx_init(mtx, desc, MTX_DEF) +#define smb_sl_init(mtx, desc) mtx_init(mtx, desc, NULL, MTX_DEF) #define smb_sl_destroy(mtx) mtx_destroy(mtx) #define smb_sl_lock(mtx) mtx_lock(mtx) #define smb_sl_unlock(mtx) mtx_unlock(mtx) diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 375527a..1369591 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -896,7 +896,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); } diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 6b7abe1..746798a 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -1768,8 +1768,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/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 6b7abe1..746798a 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -1768,8 +1768,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/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 375527a..1369591 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -896,7 +896,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); } diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index fa8cd2e..540e8a6 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/if_dc.c @@ -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); /* diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c index c1f42e2..f027900 100644 --- a/sys/pci/if_pcn.c +++ b/sys/pci/if_pcn.c @@ -416,7 +416,8 @@ static int pcn_probe(dev) sc->pcn_btag = rman_get_bustag(sc->pcn_res); sc->pcn_bhandle = rman_get_bushandle(sc->pcn_res); mtx_init(&sc->pcn_mtx, - device_get_nameunit(dev), MTX_DEF); + device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF); PCN_LOCK(sc); /* * Note: we can *NOT* put the chip into @@ -504,7 +505,8 @@ static int pcn_attach(dev) unit = device_get_unit(dev); /* Initialize our mutex. */ - mtx_init(&sc->pcn_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->pcn_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); PCN_LOCK(sc); /* diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c index aec9420..b912571 100644 --- a/sys/pci/if_rl.c +++ b/sys/pci/if_rl.c @@ -835,7 +835,8 @@ static int rl_attach(dev) unit = device_get_unit(dev); bzero(sc, sizeof(struct rl_softc)); - mtx_init(&sc->rl_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->rl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); RL_LOCK(sc); /* diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c index 771e69e..6322a3b 100644 --- a/sys/pci/if_sf.c +++ b/sys/pci/if_sf.c @@ -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. diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index 333210c..22a2163 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -799,7 +799,8 @@ static int sis_attach(dev) unit = device_get_unit(dev); bzero(sc, sizeof(struct sis_softc)); - mtx_init(&sc->sis_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->sis_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); SIS_LOCK(sc); if (pci_get_device(dev) == SIS_DEVICEID_900) diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c index 6c39da2..3a6cb4f 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -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); /* diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c index 0473ca8..6b65dcf 100644 --- a/sys/pci/if_ste.c +++ b/sys/pci/if_ste.c @@ -914,7 +914,8 @@ static int ste_attach(dev) unit = device_get_unit(dev); bzero(sc, sizeof(struct ste_softc)); - mtx_init(&sc->ste_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->ste_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); STE_LOCK(sc); /* diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c index 7926105..17f5a00 100644 --- a/sys/pci/if_ti.c +++ b/sys/pci/if_ti.c @@ -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; diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c index 7d19023..1c52f9a 100644 --- a/sys/pci/if_tl.c +++ b/sys/pci/if_tl.c @@ -1122,7 +1122,8 @@ static int tl_attach(dev) goto fail; } - mtx_init(&sc->tl_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->tl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); TL_LOCK(sc); /* diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c index 33a6897..5c15aae 100644 --- a/sys/pci/if_vr.c +++ b/sys/pci/if_vr.c @@ -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); /* diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c index 6f104b6..8647e32 100644 --- a/sys/pci/if_wb.c +++ b/sys/pci/if_wb.c @@ -814,7 +814,8 @@ static int wb_attach(dev) sc = device_get_softc(dev); unit = device_get_unit(dev); - mtx_init(&sc->wb_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->wb_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); WB_LOCK(sc); /* diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index 6a7f6c6..782361c 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -1255,7 +1255,8 @@ static int xl_attach(dev) sc = device_get_softc(dev); unit = device_get_unit(dev); - mtx_init(&sc->xl_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->xl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); XL_LOCK(sc); sc->xl_flags = 0; diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c index 8d5643a..46b55b4 100644 --- a/sys/sparc64/sparc64/intr_machdep.c +++ b/sys/sparc64/sparc64/intr_machdep.c @@ -177,7 +177,7 @@ void intr_init2() { - mtx_init(&intr_table_lock, "ithread table lock", MTX_SPIN); + mtx_init(&intr_table_lock, "ithread table lock", NULL, MTX_SPIN); } /* Schedule a heavyweight interrupt process. */ diff --git a/sys/sparc64/sparc64/mp_machdep.c b/sys/sparc64/sparc64/mp_machdep.c index 8d5ddf5..9a9f93f 100644 --- a/sys/sparc64/sparc64/mp_machdep.c +++ b/sys/sparc64/sparc64/mp_machdep.c @@ -216,7 +216,7 @@ cpu_mp_start(void) u_int mid; u_long s; - mtx_init(&ap_boot_mtx, "ap boot", MTX_SPIN); + mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); intr_setup(PIL_AST, cpu_ipi_ast, -1, NULL, NULL); intr_setup(PIL_RENDEZVOUS, (ih_func_t *)smp_rendezvous_action, diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index f02c809..dc60f4e 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1364,7 +1364,7 @@ ffs_init(vfsp) { softdep_initialize(); - mtx_init(&ffs_inode_hash_mtx, "ifsvgt", MTX_DEF); + mtx_init(&ffs_inode_hash_mtx, "ifsvgt", NULL, MTX_DEF); return (ufs_init(vfsp)); } diff --git a/sys/ufs/ifs/ifs_vfsops.c b/sys/ufs/ifs/ifs_vfsops.c index b86048f..23040a9 100644 --- a/sys/ufs/ifs/ifs_vfsops.c +++ b/sys/ufs/ifs/ifs_vfsops.c @@ -146,7 +146,7 @@ static int ifs_init(vfsp) struct vfsconf *vfsp; { - mtx_init(&ifs_inode_hash_mtx, "ifsvgt", MTX_DEF); + mtx_init(&ifs_inode_hash_mtx, "ifsvgt", NULL, MTX_DEF); return (ufs_init(vfsp)); } diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c index be9d600..61c7fda 100644 --- a/sys/ufs/ufs/ufs_dirhash.c +++ b/sys/ufs/ufs/ufs_dirhash.c @@ -191,7 +191,7 @@ ufsdirhash_build(struct inode *ip) } /* Initialise the hash table and block statistics. */ - mtx_init(&dh->dh_mtx, "dirhash", MTX_DEF); + mtx_init(&dh->dh_mtx, "dirhash", NULL, MTX_DEF); dh->dh_narrays = narrays; dh->dh_hlen = nslots; dh->dh_nblk = nblocks; @@ -1064,7 +1064,7 @@ ufsdirhash_init() { ufsdirhash_zone = uma_zcreate("DIRHASH", DH_NBLKOFF * sizeof(daddr_t), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - mtx_init(&ufsdirhash_mtx, "dirhash list", MTX_DEF); + mtx_init(&ufsdirhash_mtx, "dirhash list", NULL, MTX_DEF); TAILQ_INIT(&ufsdirhash_list); } SYSINIT(ufsdirhash, SI_SUB_PSEUDO, SI_ORDER_ANY, ufsdirhash_init, NULL) diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c index d31add3..eda2ab4 100644 --- a/sys/ufs/ufs/ufs_ihash.c +++ b/sys/ufs/ufs/ufs_ihash.c @@ -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); } /* 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; |
