Page MenuHomeFreeBSD
Files F162395603

D2613.diff
No OneTemporary
Actions

D2613.diff
View Options

Index: head/sys/amd64/amd64/mp_watchdog.c
===================================================================
--- head/sys/amd64/amd64/mp_watchdog.c
+++ head/sys/amd64/amd64/mp_watchdog.c
@@ -85,7 +85,7 @@
watchdog_init(void *arg)
{
- callout_init(&watchdog_callout, CALLOUT_MPSAFE);
+ callout_init(&watchdog_callout, 1);
if (watchdog_cpu != -1)
watchdog_change(watchdog_cpu);
}
Index: head/sys/amd64/vmm/io/vatpit.c
===================================================================
--- head/sys/amd64/vmm/io/vatpit.c
+++ head/sys/amd64/vmm/io/vatpit.c
@@ -436,7 +436,7 @@
vatpit->freq_sbt = bttosbt(bt);
for (i = 0; i < 3; i++) {
- callout_init(&vatpit->channel[i].callout, true);
+ callout_init(&vatpit->channel[i].callout, 1);
arg = &vatpit->channel[i].callout_arg;
arg->vatpit = vatpit;
arg->channel_num = i;
Index: head/sys/arm/amlogic/aml8726/aml8726_rng.c
===================================================================
--- head/sys/arm/amlogic/aml8726/aml8726_rng.c
+++ head/sys/arm/amlogic/aml8726/aml8726_rng.c
@@ -115,7 +115,7 @@
else
sc->ticks = 1;
- callout_init(&sc->co, CALLOUT_MPSAFE);
+ callout_init(&sc->co, 1);
callout_reset(&sc->co, sc->ticks, aml8726_rng_harvest, sc);
return (0);
Index: head/sys/arm/freescale/imx/imx_sdhci.c
===================================================================
--- head/sys/arm/freescale/imx/imx_sdhci.c
+++ head/sys/arm/freescale/imx/imx_sdhci.c
@@ -745,7 +745,7 @@
sc->force_card_present = true;
}
- callout_init(&sc->r1bfix_callout, true);
+ callout_init(&sc->r1bfix_callout, 1);
sdhci_init_slot(dev, &sc->slot, 0);
bus_generic_probe(dev);
Index: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
===================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -14225,8 +14225,8 @@
state->dts_cleaner = CYCLIC_NONE;
state->dts_deadman = CYCLIC_NONE;
#else
- callout_init(&state->dts_cleaner, CALLOUT_MPSAFE);
- callout_init(&state->dts_deadman, CALLOUT_MPSAFE);
+ callout_init(&state->dts_cleaner, 1);
+ callout_init(&state->dts_deadman, 1);
#endif
state->dts_vstate.dtvs_state = state;
Index: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
===================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
@@ -671,7 +671,7 @@
mutex_exit(&cpu_lock);
#else /* !illumos */
#ifdef _KERNEL
- callout_init(&spa->spa_deadman_cycid, CALLOUT_MPSAFE);
+ callout_init(&spa->spa_deadman_cycid, 1);
#endif
#endif
refcount_create(&spa->spa_refcount);
Index: head/sys/cddl/dev/profile/profile.c
===================================================================
--- head/sys/cddl/dev/profile/profile.c
+++ head/sys/cddl/dev/profile/profile.c
@@ -342,7 +342,7 @@
prof->prof_cyclic = CYCLIC_NONE;
#else
prof->prof_interval = nsec_to_sbt(interval);
- callout_init(&prof->prof_cyclic, CALLOUT_MPSAFE);
+ callout_init(&prof->prof_cyclic, 1);
#endif
prof->prof_kind = kind;
prof->prof_id = dtrace_probe_create(profile_id,
@@ -590,7 +590,7 @@
pcpu->profc_probe = prof;
pcpu->profc_expected = sbinuptime() + prof->prof_interval;
pcpu->profc_interval = prof->prof_interval;
- callout_init(&pcpu->profc_cyclic, CALLOUT_MPSAFE);
+ callout_init(&pcpu->profc_cyclic, 1);
callout_reset_sbt_on(&pcpu->profc_cyclic,
pcpu->profc_expected, 0, profile_fire, pcpu,
cpu, C_DIRECT_EXEC | C_ABSOLUTE);
Index: head/sys/compat/ndis/subr_ntoskrnl.c
===================================================================
--- head/sys/compat/ndis/subr_ntoskrnl.c
+++ head/sys/compat/ndis/subr_ntoskrnl.c
@@ -3749,7 +3749,7 @@
timer->k_callout = c;
- callout_init(c, CALLOUT_MPSAFE);
+ callout_init(c, 1);
callout_reset(c, ticks, ntoskrnl_timercall, timer);
}
Index: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
===================================================================
--- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
@@ -189,7 +189,7 @@
#if 0
softc->ipf_slow_ch = timeout(ipf_timer_func, softc, hz/2);
#endif
- callout_init(&softc->ipf_slow_ch, CALLOUT_MPSAFE);
+ callout_init(&softc->ipf_slow_ch, 1);
callout_reset(&softc->ipf_slow_ch,
(hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT,
ipf_timer_func, softc);
@@ -235,7 +235,7 @@
softc->ipf_slow_ch = timeout(ipf_timer_func, softc,
(hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT);
#endif
- callout_init(&softc->ipf_slow_ch, CALLOUT_MPSAFE);
+ callout_init(&softc->ipf_slow_ch, 1);
callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT,
ipf_timer_func, softc);
return 0;
Index: head/sys/contrib/vchiq/interface/compat/vchi_bsd.c
===================================================================
--- head/sys/contrib/vchiq/interface/compat/vchi_bsd.c
+++ head/sys/contrib/vchiq/interface/compat/vchi_bsd.c
@@ -80,7 +80,7 @@
init_timer(struct timer_list *t)
{
mtx_init(&t->mtx, "dahdi timer lock", NULL, MTX_SPIN);
- callout_init(&t->callout, CALLOUT_MPSAFE);
+ callout_init(&t->callout, 1);
t->expires = 0;
/*
* function and data are not initialized intentionally:
Index: head/sys/dev/acpica/acpi.c
===================================================================
--- head/sys/dev/acpica/acpi.c
+++ head/sys/dev/acpica/acpi.c
@@ -447,7 +447,7 @@
sc = device_get_softc(dev);
sc->acpi_dev = dev;
- callout_init(&sc->susp_force_to, TRUE);
+ callout_init(&sc->susp_force_to, 1);
error = ENXIO;
Index: head/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
===================================================================
--- head/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
+++ head/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
@@ -454,11 +454,11 @@
aju_intr_readable_enable(sc);
AJU_UNLOCK(sc);
} else {
- callout_init(&sc->ajus_io_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->ajus_io_callout, 1);
callout_reset(&sc->ajus_io_callout, AJU_IO_POLLINTERVAL,
aju_io_callout, sc);
}
- callout_init(&sc->ajus_ac_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->ajus_ac_callout, 1);
callout_reset(&sc->ajus_ac_callout, AJU_AC_POLLINTERVAL,
aju_ac_callout, sc);
return (0);
Index: head/sys/dev/ath/if_ath.c
===================================================================
--- head/sys/dev/ath/if_ath.c
+++ head/sys/dev/ath/if_ath.c
@@ -847,7 +847,7 @@
sc->sc_ledstate = 1;
sc->sc_ledon = 0; /* low true */
sc->sc_ledidle = (2700*hz)/1000; /* 2.7sec */
- callout_init(&sc->sc_ledtimer, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_ledtimer, 1);
/*
* Don't setup hardware-based blinking.
Index: head/sys/dev/ce/if_ce.c
===================================================================
--- head/sys/dev/ce/if_ce.c
+++ head/sys/dev/ce/if_ce.c
@@ -104,10 +104,6 @@
#define CE_DEBUG2(d,s) ({if (d->chan->debug>1) {\
printf ("%s: ", d->name); printf s;}})
-#ifndef CALLOUT_MPSAFE
-#define CALLOUT_MPSAFE 0
-#endif
-
#ifndef IF_DRAIN
#define IF_DRAIN(ifq) do { \
struct mbuf *m; \
@@ -609,7 +605,7 @@
return (ENXIO);
}
#if __FreeBSD_version >= 500000
- callout_init (&led_timo[unit], CALLOUT_MPSAFE);
+ callout_init (&led_timo[unit], 1);
#else
callout_init (&led_timo[unit]);
#endif
@@ -661,7 +657,7 @@
continue;
d = c->sys;
- callout_init (&d->timeout_handle, CALLOUT_MPSAFE);
+ callout_init (&d->timeout_handle, 1);
#ifdef NETGRAPH
if (ng_make_node_common (&typestruct, &d->node) != 0) {
printf ("%s: cannot make common node\n", d->name);
@@ -2558,7 +2554,7 @@
cdevsw_add (&ce_cdevsw);
#endif
#if __FreeBSD_version >= 500000
- callout_init (&timeout_handle, CALLOUT_MPSAFE);
+ callout_init (&timeout_handle, 1);
#else
callout_init (&timeout_handle);
#endif
Index: head/sys/dev/cp/if_cp.c
===================================================================
--- head/sys/dev/cp/if_cp.c
+++ head/sys/dev/cp/if_cp.c
@@ -445,7 +445,7 @@
splx (s);
return (ENXIO);
}
- callout_init (&led_timo[unit], CALLOUT_MPSAFE);
+ callout_init (&led_timo[unit], 1);
error = bus_setup_intr (dev, bd->cp_irq,
INTR_TYPE_NET|INTR_MPSAFE,
NULL, cp_intr, bd, &bd->cp_intrhand);
@@ -474,7 +474,7 @@
d->board = b;
d->chan = c;
c->sys = d;
- callout_init (&d->timeout_handle, CALLOUT_MPSAFE);
+ callout_init (&d->timeout_handle, 1);
#ifdef NETGRAPH
if (ng_make_node_common (&typestruct, &d->node) != 0) {
printf ("%s: cannot make common node\n", d->name);
@@ -2223,7 +2223,7 @@
printf ("Failed to register ng_cp\n");
#endif
++load_count;
- callout_init (&timeout_handle, CALLOUT_MPSAFE);
+ callout_init (&timeout_handle, 1);
callout_reset (&timeout_handle, hz*5, cp_timeout, 0);
break;
case MOD_UNLOAD:
Index: head/sys/dev/ctau/if_ct.c
===================================================================
--- head/sys/dev/ctau/if_ct.c
+++ head/sys/dev/ctau/if_ct.c
@@ -646,7 +646,7 @@
return ENXIO;
}
- callout_init (&led_timo[unit], CALLOUT_MPSAFE);
+ callout_init (&led_timo[unit], 1);
s = splimp ();
if (bus_setup_intr (dev, bd->irq_res,
INTR_TYPE_NET|INTR_MPSAFE,
@@ -685,7 +685,7 @@
c->sys = d;
channel [b->num*NCHAN + c->num] = d;
sprintf (d->name, "ct%d.%d", b->num, c->num);
- callout_init (&d->timeout_handle, CALLOUT_MPSAFE);
+ callout_init (&d->timeout_handle, 1);
#ifdef NETGRAPH
if (ng_make_node_common (&typestruct, &d->node) != 0) {
@@ -2162,7 +2162,7 @@
printf ("Failed to register ng_ct\n");
#endif
++load_count;
- callout_init (&timeout_handle, CALLOUT_MPSAFE);
+ callout_init (&timeout_handle, 1);
callout_reset (&timeout_handle, hz*5, ct_timeout, 0);
break;
case MOD_UNLOAD:
Index: head/sys/dev/cx/if_cx.c
===================================================================
--- head/sys/dev/cx/if_cx.c
+++ head/sys/dev/cx/if_cx.c
@@ -746,7 +746,7 @@
return ENXIO;
}
b->sys = bd;
- callout_init (&led_timo[b->num], CALLOUT_MPSAFE);
+ callout_init (&led_timo[b->num], 1);
s = splhigh ();
if (bus_setup_intr (dev, bd->irq_res,
INTR_TYPE_NET|INTR_MPSAFE,
@@ -796,7 +796,7 @@
case T_UNIV_RS232:
case T_UNIV_RS449:
case T_UNIV_V35:
- callout_init (&d->timeout_handle, CALLOUT_MPSAFE);
+ callout_init (&d->timeout_handle, 1);
#ifdef NETGRAPH
if (ng_make_node_common (&typestruct, &d->node) != 0) {
printf ("%s: cannot make common node\n", d->name);
@@ -867,7 +867,7 @@
ttycreate(d->tty, TS_CALLOUT, "x%r%r", b->num, c->num);
d->devt = make_dev (&cx_cdevsw, b->num*NCHAN + c->num + 64, UID_ROOT, GID_WHEEL, 0600, "cx%d", b->num*NCHAN + c->num);
d->devt->si_drv1 = d;
- callout_init (&d->dcd_timeout_handle, CALLOUT_MPSAFE);
+ callout_init (&d->dcd_timeout_handle, 1);
}
splx (s);
@@ -2497,7 +2497,7 @@
#endif
++load_count;
- callout_init (&timeout_handle, CALLOUT_MPSAFE);
+ callout_init (&timeout_handle, 1);
callout_reset (&timeout_handle, hz*5, cx_timeout, 0);
/* Software interrupt. */
swi_add(&tty_intr_event, "cx", cx_softintr, NULL, SWI_TTY,
Index: head/sys/dev/cxgb/cxgb_main.c
===================================================================
--- head/sys/dev/cxgb/cxgb_main.c
+++ head/sys/dev/cxgb/cxgb_main.c
@@ -592,7 +592,7 @@
/* Create a periodic callout for checking adapter status */
- callout_init(&sc->cxgb_tick_ch, TRUE);
+ callout_init(&sc->cxgb_tick_ch, 1);
if (t3_check_fw_version(sc) < 0 || force_fw_update) {
/*
@@ -1006,7 +1006,7 @@
device_get_unit(device_get_parent(dev)), p->port_id);
PORT_LOCK_INIT(p, p->lockbuf);
- callout_init(&p->link_check_ch, CALLOUT_MPSAFE);
+ callout_init(&p->link_check_ch, 1);
TASK_INIT(&p->link_check_task, 0, check_link_status, p);
/* Allocate an ifnet object and set it up */
Index: head/sys/dev/cxgb/cxgb_sge.c
===================================================================
--- head/sys/dev/cxgb/cxgb_sge.c
+++ head/sys/dev/cxgb/cxgb_sge.c
@@ -1008,7 +1008,7 @@
int
t3_sge_init_adapter(adapter_t *sc)
{
- callout_init(&sc->sge_timer_ch, CALLOUT_MPSAFE);
+ callout_init(&sc->sge_timer_ch, 1);
callout_reset(&sc->sge_timer_ch, TX_RECLAIM_PERIOD, sge_timer_cb, sc);
TASK_INIT(&sc->slow_intr_task, 0, sge_slow_intr_handler, sc);
return (0);
Index: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
===================================================================
--- head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
+++ head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
@@ -163,7 +163,7 @@
* XXX this looks racy
*/
get_ep(&ep->com);
- callout_init(&ep->timer, TRUE);
+ callout_init(&ep->timer, 1);
}
callout_reset(&ep->timer, ep_timeout_secs * hz, ep_timeout, ep);
}
@@ -1307,7 +1307,7 @@
err = (-ENOMEM);
goto out;
}
- callout_init(&ep->timer, TRUE);
+ callout_init(&ep->timer, 1);
ep->plen = conn_param->private_data_len;
if (ep->plen)
memcpy(ep->mpa_pkt + sizeof(struct mpa_message),
@@ -1598,7 +1598,7 @@
free(remote, M_SONAME);
get_ep(&parent_ep->com);
child_ep->parent_ep = parent_ep;
- callout_init(&child_ep->timer, TRUE);
+ callout_init(&child_ep->timer, 1);
state_set(&child_ep->com, MPA_REQ_WAIT);
start_ep_timer(child_ep);
Index: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
===================================================================
--- head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
+++ head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
@@ -906,7 +906,7 @@
insert_mmap(ucontext, mm2);
}
qhp->ibqp.qp_num = qhp->wq.qpid;
- callout_init(&(qhp->timer), TRUE);
+ callout_init(&(qhp->timer), 1);
CTR6(KTR_IW_CXGB, "sq_num_entries %d, rq_num_entries %d "
"qpid 0x%0x qhp %p dma_addr 0x%llx size %d",
qhp->attr.sq_num_entries, qhp->attr.rq_num_entries,
Index: head/sys/dev/cxgbe/t4_main.c
===================================================================
--- head/sys/dev/cxgbe/t4_main.c
+++ head/sys/dev/cxgbe/t4_main.c
@@ -613,7 +613,7 @@
mtx_init(&sc->sfl_lock, "starving freelists", 0, MTX_DEF);
TAILQ_INIT(&sc->sfl);
- callout_init(&sc->sfl_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->sfl_callout, 1);
mtx_init(&sc->regwin_lock, "register and memory window", 0, MTX_DEF);
@@ -1082,7 +1082,7 @@
pi->ifp = ifp;
ifp->if_softc = pi;
- callout_init(&pi->tick, CALLOUT_MPSAFE);
+ callout_init(&pi->tick, 1);
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
Index: head/sys/dev/dcons/dcons_os.c
===================================================================
--- head/sys/dev/dcons/dcons_os.c
+++ head/sys/dev/dcons/dcons_os.c
@@ -374,7 +374,7 @@
dcons_attach_port(DCONS_CON, "dcons", 0);
dcons_attach_port(DCONS_GDB, "dgdb", DC_GDB);
- callout_init(&dcons_callout, CALLOUT_MPSAFE);
+ callout_init(&dcons_callout, 1);
polltime = hz / poll_hz;
callout_reset(&dcons_callout, polltime, dcons_timeout, NULL);
return(0);
Index: head/sys/dev/drm2/drm_irq.c
===================================================================
--- head/sys/dev/drm2/drm_irq.c
+++ head/sys/dev/drm2/drm_irq.c
@@ -210,7 +210,7 @@
{
int i, ret = -ENOMEM;
- callout_init(&dev->vblank_disable_callout, CALLOUT_MPSAFE);
+ callout_init(&dev->vblank_disable_callout, 1);
mtx_init(&dev->vbl_lock, "drmvbl", NULL, MTX_DEF);
mtx_init(&dev->vblank_time_lock, "drmvtl", NULL, MTX_DEF);
Index: head/sys/dev/drm2/i915/intel_display.c
===================================================================
--- head/sys/dev/drm2/i915/intel_display.c
+++ head/sys/dev/drm2/i915/intel_display.c
@@ -6449,7 +6449,7 @@
intel_crtc->busy = false;
- callout_init(&intel_crtc->idle_callout, CALLOUT_MPSAFE);
+ callout_init(&intel_crtc->idle_callout, 1);
}
int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
@@ -7038,7 +7038,7 @@
intel_setup_outputs(dev);
TASK_INIT(&dev_priv->idle_task, 0, intel_idle_update, dev_priv);
- callout_init(&dev_priv->idle_callout, CALLOUT_MPSAFE);
+ callout_init(&dev_priv->idle_callout, 1);
}
void intel_modeset_gem_init(struct drm_device *dev)
Index: head/sys/dev/glxsb/glxsb.c
===================================================================
--- head/sys/dev/glxsb/glxsb.c
+++ head/sys/dev/glxsb/glxsb.c
@@ -331,7 +331,7 @@
sc->sc_rnghz = hz / 100;
else
sc->sc_rnghz = 1;
- callout_init(&sc->sc_rngco, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_rngco, 1);
glxsb_rnd(sc);
return (0);
Index: head/sys/dev/gxemul/cons/gxemul_cons.c
===================================================================
--- head/sys/dev/gxemul/cons/gxemul_cons.c
+++ head/sys/dev/gxemul/cons/gxemul_cons.c
@@ -279,7 +279,7 @@
tp = tty_alloc(&gxemul_cons_ttydevsw, NULL);
tty_init_console(tp, 0);
tty_makedev(tp, NULL, "%s", "ttyu0");
- callout_init(&gxemul_cons_callout, CALLOUT_MPSAFE);
+ callout_init(&gxemul_cons_callout, 1);
callout_reset(&gxemul_cons_callout, gxemul_cons_polltime,
gxemul_cons_timeout, tp);
Index: head/sys/dev/hifn/hifn7751.c
===================================================================
--- head/sys/dev/hifn/hifn7751.c
+++ head/sys/dev/hifn/hifn7751.c
@@ -589,7 +589,7 @@
if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG))
hifn_init_pubrng(sc);
- callout_init(&sc->sc_tickto, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_tickto, 1);
callout_reset(&sc->sc_tickto, hz, hifn_tick, sc);
return (0);
@@ -765,7 +765,7 @@
sc->sc_rnghz = hz / 100;
else
sc->sc_rnghz = 1;
- callout_init(&sc->sc_rngto, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_rngto, 1);
callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc);
}
Index: head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
===================================================================
--- head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
+++ head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
@@ -1473,7 +1473,7 @@
}
if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) {
- callout_init(&reqp->callout, CALLOUT_MPSAFE);
+ callout_init(&reqp->callout, 1);
callout_reset_sbt(&reqp->callout,
SBT_1MS * ccb->ccb_h.timeout, 0,
storvsc_timeout, reqp, 0);
Index: head/sys/dev/if_ndis/if_ndis.c
===================================================================
--- head/sys/dev/if_ndis/if_ndis.c
+++ head/sys/dev/if_ndis/if_ndis.c
@@ -558,7 +558,7 @@
InitializeListHead(&sc->ndis_shlist);
InitializeListHead(&sc->ndisusb_tasklist);
InitializeListHead(&sc->ndisusb_xferdonelist);
- callout_init(&sc->ndis_stat_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->ndis_stat_callout, 1);
if (sc->ndis_iftype == PCMCIABus) {
error = ndis_alloc_amem(sc);
@@ -734,7 +734,7 @@
uint32_t arg;
int r;
- callout_init(&sc->ndis_scan_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->ndis_scan_callout, 1);
ifp->if_ioctl = ndis_ioctl_80211;
ic->ic_ifp = ifp;
Index: head/sys/dev/isci/isci_io_request.c
===================================================================
--- head/sys/dev/isci/isci_io_request.c
+++ head/sys/dev/isci/isci_io_request.c
@@ -680,7 +680,7 @@
request->dma_tag = io_buffer_dma_tag;
request->physical_address = physical_address;
bus_dmamap_create(request->dma_tag, 0, &request->dma_map);
- callout_init(&request->timer, CALLOUT_MPSAFE);
+ callout_init(&request->timer, 1);
}
static void
Index: head/sys/dev/mfi/mfi.c
===================================================================
--- head/sys/dev/mfi/mfi.c
+++ head/sys/dev/mfi/mfi.c
@@ -780,7 +780,7 @@
bus_generic_attach(sc->mfi_dev);
/* Start the timeout watchdog */
- callout_init(&sc->mfi_watchdog_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->mfi_watchdog_callout, 1);
callout_reset(&sc->mfi_watchdog_callout, mfi_cmd_timeout * hz,
mfi_timeout, sc);
Index: head/sys/dev/mwl/if_mwl.c
===================================================================
--- head/sys/dev/mwl/if_mwl.c
+++ head/sys/dev/mwl/if_mwl.c
@@ -363,7 +363,7 @@
if (error != 0) /* NB: mwl_setupdma prints msg */
goto bad1;
- callout_init(&sc->sc_timer, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_timer, 1);
callout_init_mtx(&sc->sc_watchdog, &sc->sc_mtx, 0);
sc->sc_tq = taskqueue_create("mwl_taskq", M_NOWAIT,
Index: head/sys/dev/nand/nandsim_chip.c
===================================================================
--- head/sys/dev/nand/nandsim_chip.c
+++ head/sys/dev/nand/nandsim_chip.c
@@ -94,7 +94,7 @@
return (NULL);
mtx_init(&chip->ns_lock, "nandsim lock", NULL, MTX_DEF);
- callout_init(&chip->ns_callout, CALLOUT_MPSAFE);
+ callout_init(&chip->ns_callout, 1);
STAILQ_INIT(&chip->nandsim_events);
chip->chip_num = chip_num;
Index: head/sys/dev/ntb/if_ntb/if_ntb.c
===================================================================
--- head/sys/dev/ntb/if_ntb/if_ntb.c
+++ head/sys/dev/ntb/if_ntb/if_ntb.c
@@ -555,8 +555,8 @@
qp->tx_index = 0;
callout_init(&qp->link_work, 0);
- callout_init(&qp->queue_full, CALLOUT_MPSAFE);
- callout_init(&qp->rx_full, CALLOUT_MPSAFE);
+ callout_init(&qp->queue_full, 1);
+ callout_init(&qp->rx_full, 1);
mtx_init(&qp->ntb_rx_pend_q_lock, "ntb rx pend q", NULL, MTX_SPIN);
mtx_init(&qp->ntb_rx_free_q_lock, "ntb rx free q", NULL, MTX_SPIN);
Index: head/sys/dev/ntb/ntb_hw/ntb_hw.c
===================================================================
--- head/sys/dev/ntb/ntb_hw/ntb_hw.c
+++ head/sys/dev/ntb/ntb_hw/ntb_hw.c
@@ -266,8 +266,8 @@
ntb->features = p->features;
/* Heartbeat timer for NTB_SOC since there is no link interrupt */
- callout_init(&ntb->heartbeat_timer, CALLOUT_MPSAFE);
- callout_init(&ntb->lr_timer, CALLOUT_MPSAFE);
+ callout_init(&ntb->heartbeat_timer, 1);
+ callout_init(&ntb->lr_timer, 1);
DETACH_ON_ERROR(ntb_map_pci_bars(ntb));
DETACH_ON_ERROR(ntb_initialize_hw(ntb));
Index: head/sys/dev/nxge/if_nxge.c
===================================================================
--- head/sys/dev/nxge/if_nxge.c
+++ head/sys/dev/nxge/if_nxge.c
@@ -1744,7 +1744,7 @@
return;
/* Initializing timer */
- callout_init(&lldev->timer, CALLOUT_MPSAFE);
+ callout_init(&lldev->timer, 1);
xge_trace(XGE_TRACE, "Set MTU size");
status = xge_hal_device_mtu_set(hldev, ifnetp->if_mtu);
Index: head/sys/dev/oce/oce_if.c
===================================================================
--- head/sys/dev/oce/oce_if.c
+++ head/sys/dev/oce/oce_if.c
@@ -341,7 +341,7 @@
oce_add_sysctls(sc);
- callout_init(&sc->timer, CALLOUT_MPSAFE);
+ callout_init(&sc->timer, 1);
rc = callout_reset(&sc->timer, 2 * hz, oce_local_timer, sc);
if (rc)
goto stats_free;
Index: head/sys/dev/patm/if_patm_attach.c
===================================================================
--- head/sys/dev/patm/if_patm_attach.c
+++ head/sys/dev/patm/if_patm_attach.c
@@ -208,7 +208,7 @@
mtx_init(&sc->tst_lock, "tst lock", NULL, MTX_DEF);
cv_init(&sc->vcc_cv, "vcc_close");
- callout_init(&sc->tst_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->tst_callout, 1);
sysctl_ctx_init(&sc->sysctl_ctx);
Index: head/sys/dev/qlxgb/qla_os.c
===================================================================
--- head/sys/dev/qlxgb/qla_os.c
+++ head/sys/dev/qlxgb/qla_os.c
@@ -378,7 +378,7 @@
ha->flags.qla_watchdog_active = 1;
ha->flags.qla_watchdog_pause = 1;
- callout_init(&ha->tx_callout, TRUE);
+ callout_init(&ha->tx_callout, 1);
/* create ioctl device interface */
if (qla_make_cdev(ha)) {
Index: head/sys/dev/qlxgbe/ql_os.c
===================================================================
--- head/sys/dev/qlxgbe/ql_os.c
+++ head/sys/dev/qlxgbe/ql_os.c
@@ -419,7 +419,7 @@
taskqueue_start_threads(&ha->tx_tq, 1, PI_NET, "%s txq",
device_get_nameunit(ha->pci_dev));
- callout_init(&ha->tx_callout, TRUE);
+ callout_init(&ha->tx_callout, 1);
ha->flags.qla_callout_init = 1;
/* create ioctl device interface */
Index: head/sys/dev/qlxge/qls_os.c
===================================================================
--- head/sys/dev/qlxge/qls_os.c
+++ head/sys/dev/qlxge/qls_os.c
@@ -453,7 +453,7 @@
taskqueue_start_threads(&ha->tx_tq, 1, PI_NET, "%s txq",
device_get_nameunit(ha->pci_dev));
- callout_init(&ha->tx_callout, TRUE);
+ callout_init(&ha->tx_callout, 1);
ha->flags.qla_callout_init = 1;
/* create ioctl device interface */
Index: head/sys/dev/rndtest/rndtest.c
===================================================================
--- head/sys/dev/rndtest/rndtest.c
+++ head/sys/dev/rndtest/rndtest.c
@@ -98,7 +98,7 @@
#if __FreeBSD_version < 500000
callout_init(&rsp->rs_to);
#else
- callout_init(&rsp->rs_to, CALLOUT_MPSAFE);
+ callout_init(&rsp->rs_to, 1);
#endif
} else
device_printf(dev, "rndtest_init: no memory for state block\n");
Index: head/sys/dev/safe/safe.c
===================================================================
--- head/sys/dev/safe/safe.c
+++ head/sys/dev/safe/safe.c
@@ -425,7 +425,7 @@
#endif
safe_rng_init(sc);
- callout_init(&sc->sc_rngto, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_rngto, 1);
callout_reset(&sc->sc_rngto, hz*safe_rnginterval, safe_rng, sc);
}
#endif /* SAFE_NO_RNG */
Index: head/sys/dev/sfxge/sfxge_rx.c
===================================================================
--- head/sys/dev/sfxge/sfxge_rx.c
+++ head/sys/dev/sfxge/sfxge_rx.c
@@ -1217,7 +1217,7 @@
M_SFXGE, M_WAITOK | M_ZERO);
sfxge_lro_init(rxq);
- callout_init(&rxq->refill_callout, B_TRUE);
+ callout_init(&rxq->refill_callout, 1);
rxq->init_state = SFXGE_RXQ_INITIALIZED;
Index: head/sys/dev/sound/midi/mpu401.c
===================================================================
--- head/sys/dev/sound/midi/mpu401.c
+++ head/sys/dev/sound/midi/mpu401.c
@@ -185,7 +185,7 @@
kobj_init((kobj_t)m, cls);
- callout_init(&m->timer, CALLOUT_MPSAFE);
+ callout_init(&m->timer, 1);
m->si = softintr;
m->cookie = cookie;
Index: head/sys/dev/sound/pci/atiixp.c
===================================================================
--- head/sys/dev/sound/pci/atiixp.c
+++ head/sys/dev/sound/pci/atiixp.c
@@ -1194,7 +1194,7 @@
sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_atiixp softc");
sc->dev = dev;
- callout_init(&sc->poll_timer, CALLOUT_MPSAFE);
+ callout_init(&sc->poll_timer, 1);
sc->poll_ticks = 1;
if (resource_int_value(device_get_name(sc->dev),
Index: head/sys/dev/sound/pci/es137x.c
===================================================================
--- head/sys/dev/sound/pci/es137x.c
+++ head/sys/dev/sound/pci/es137x.c
@@ -1741,7 +1741,7 @@
es->st = rman_get_bustag(es->reg);
es->sh = rman_get_bushandle(es->reg);
- callout_init(&es->poll_timer, CALLOUT_MPSAFE);
+ callout_init(&es->poll_timer, 1);
es->poll_ticks = 1;
if (resource_int_value(device_get_name(dev),
Index: head/sys/dev/sound/pci/hda/hdaa.c
===================================================================
--- head/sys/dev/sound/pci/hda/hdaa.c
+++ head/sys/dev/sound/pci/hda/hdaa.c
@@ -6592,7 +6592,7 @@
devinfo->newquirks = -1;
devinfo->newgpio = -1;
devinfo->newgpo = -1;
- callout_init(&devinfo->poll_jack, CALLOUT_MPSAFE);
+ callout_init(&devinfo->poll_jack, 1);
devinfo->poll_ival = hz;
hdaa_lock(devinfo);
Index: head/sys/dev/sound/pci/hda/hdac.c
===================================================================
--- head/sys/dev/sound/pci/hda/hdac.c
+++ head/sys/dev/sound/pci/hda/hdac.c
@@ -1110,7 +1110,7 @@
sc->lock = snd_mtxcreate(device_get_nameunit(dev), "HDA driver mutex");
sc->dev = dev;
TASK_INIT(&sc->unsolq_task, 0, hdac_unsolq_task, sc);
- callout_init(&sc->poll_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->poll_callout, 1);
for (i = 0; i < HDAC_CODEC_MAX; i++)
sc->codecs[i].dev = NULL;
if (devid >= 0) {
Index: head/sys/dev/sound/pci/via8233.c
===================================================================
--- head/sys/dev/sound/pci/via8233.c
+++ head/sys/dev/sound/pci/via8233.c
@@ -1175,7 +1175,7 @@
"snd_via8233 softc");
via->dev = dev;
- callout_init(&via->poll_timer, CALLOUT_MPSAFE);
+ callout_init(&via->poll_timer, 1);
via->poll_ticks = 1;
if (resource_int_value(device_get_name(dev),
Index: head/sys/dev/twa/tw_osl_freebsd.c
===================================================================
--- head/sys/dev/twa/tw_osl_freebsd.c
+++ head/sys/dev/twa/tw_osl_freebsd.c
@@ -423,8 +423,8 @@
}
sc->watchdog_index = 0;
- callout_init(&(sc->watchdog_callout[0]), CALLOUT_MPSAFE);
- callout_init(&(sc->watchdog_callout[1]), CALLOUT_MPSAFE);
+ callout_init(&(sc->watchdog_callout[0]), 1);
+ callout_init(&(sc->watchdog_callout[1]), 1);
callout_reset(&(sc->watchdog_callout[0]), 5*hz, twa_watchdog, &sc->ctlr_handle);
return(0);
Index: head/sys/dev/tws/tws.c
===================================================================
--- head/sys/dev/tws/tws.c
+++ head/sys/dev/tws/tws.c
@@ -198,7 +198,7 @@
mtx_init( &sc->sim_lock, "tws_sim_lock", NULL, MTX_DEF);
mtx_init( &sc->gen_lock, "tws_gen_lock", NULL, MTX_DEF);
mtx_init( &sc->io_lock, "tws_io_lock", NULL, MTX_DEF | MTX_RECURSE);
- callout_init(&sc->stats_timer, CALLOUT_MPSAFE);
+ callout_init(&sc->stats_timer, 1);
if ( tws_init_trace_q(sc) == FAILURE )
printf("trace init failure\n");
@@ -719,7 +719,7 @@
sc->reqs[i].cmd_pkt->hdr.header_desc.size_header = 128;
- callout_init(&sc->reqs[i].timeout, CALLOUT_MPSAFE);
+ callout_init(&sc->reqs[i].timeout, 1);
sc->reqs[i].state = TWS_REQ_STATE_FREE;
if ( i >= TWS_RESERVED_REQS )
tws_q_insert_tail(sc, &sc->reqs[i], TWS_FREE_Q);
Index: head/sys/dev/ubsec/ubsec.c
===================================================================
--- head/sys/dev/ubsec/ubsec.c
+++ head/sys/dev/ubsec/ubsec.c
@@ -456,7 +456,7 @@
sc->sc_rnghz = hz / 100;
else
sc->sc_rnghz = 1;
- callout_init(&sc->sc_rngto, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_rngto, 1);
callout_reset(&sc->sc_rngto, sc->sc_rnghz, ubsec_rng, sc);
skip_rng:
;
Index: head/sys/dev/virtio/random/virtio_random.c
===================================================================
--- head/sys/dev/virtio/random/virtio_random.c
+++ head/sys/dev/virtio/random/virtio_random.c
@@ -129,7 +129,7 @@
sc = device_get_softc(dev);
sc->vtrnd_dev = dev;
- callout_init(&sc->vtrnd_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->vtrnd_callout, 1);
virtio_set_feature_desc(dev, vtrnd_feature_desc);
vtrnd_negotiate_features(sc);
Index: head/sys/dev/watchdog/watchdog.c
===================================================================
--- head/sys/dev/watchdog/watchdog.c
+++ head/sys/dev/watchdog/watchdog.c
@@ -389,8 +389,8 @@
{
switch(type) {
case MOD_LOAD:
- callout_init(&wd_pretimeo_handle, true);
- callout_init(&wd_softtimeo_handle, true);
+ callout_init(&wd_pretimeo_handle, 1);
+ callout_init(&wd_softtimeo_handle, 1);
wd_dev = make_dev(&wd_cdevsw, 0,
UID_ROOT, GID_WHEEL, 0600, _PATH_WATCHDOG);
return 0;
Index: head/sys/dev/xen/netfront/netfront.c
===================================================================
--- head/sys/dev/xen/netfront/netfront.c
+++ head/sys/dev/xen/netfront/netfront.c
@@ -2092,7 +2092,7 @@
ifp->if_hw_tsomaxsegsize = PAGE_SIZE;
ether_ifattach(ifp, np->mac);
- callout_init(&np->xn_stat_ch, CALLOUT_MPSAFE);
+ callout_init(&np->xn_stat_ch, 1);
netfront_carrier_off(np);
return (0);
Index: head/sys/fs/nfs/nfs_commonport.c
===================================================================
--- head/sys/fs/nfs/nfs_commonport.c
+++ head/sys/fs/nfs/nfs_commonport.c
@@ -589,7 +589,7 @@
mtx_init(&nfs_req_mutex, "nfs_req_mutex", NULL, MTX_DEF);
mtx_init(&nfsrv_nfsuserdsock.nr_mtx, "nfsuserd", NULL,
MTX_DEF);
- callout_init(&newnfsd_callout, CALLOUT_MPSAFE);
+ callout_init(&newnfsd_callout, 1);
newnfs_init();
nfsd_call_nfscommon = nfssvc_nfscommon;
loaded = 1;
Index: head/sys/gdb/gdb_cons.c
===================================================================
--- head/sys/gdb/gdb_cons.c
+++ head/sys/gdb/gdb_cons.c
@@ -76,7 +76,7 @@
/* setup tx buffer and callout */
if (c->npending == -1) {
c->npending = 0;
- callout_init(&c->flush, CALLOUT_MPSAFE);
+ callout_init(&c->flush, 1);
cp->cn_arg = c;
}
}
Index: head/sys/geom/gate/g_gate.c
===================================================================
--- head/sys/geom/gate/g_gate.c
+++ head/sys/geom/gate/g_gate.c
@@ -486,7 +486,7 @@
if (sc->sc_queue_size > G_GATE_MAX_QUEUE_SIZE)
sc->sc_queue_size = G_GATE_MAX_QUEUE_SIZE;
sc->sc_timeout = ggio->gctl_timeout;
- callout_init(&sc->sc_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_callout, 1);
mtx_lock(&g_gate_units_lock);
sc->sc_unit = g_gate_getunit(ggio->gctl_unit, &error);
Index: head/sys/geom/journal/g_journal.c
===================================================================
--- head/sys/geom/journal/g_journal.c
+++ head/sys/geom/journal/g_journal.c
@@ -2314,7 +2314,7 @@
sc->sc_rootmount = root_mount_hold("GJOURNAL");
GJ_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount);
- callout_init(&sc->sc_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_callout, 1);
if (md->md_type != GJ_TYPE_COMPLETE) {
/*
* Journal and data are on separate providers.
Index: head/sys/geom/mirror/g_mirror.c
===================================================================
--- head/sys/geom/mirror/g_mirror.c
+++ head/sys/geom/mirror/g_mirror.c
@@ -2935,7 +2935,7 @@
LIST_INIT(&sc->sc_disks);
TAILQ_INIT(&sc->sc_events);
mtx_init(&sc->sc_events_mtx, "gmirror:events", NULL, MTX_DEF);
- callout_init(&sc->sc_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_callout, 1);
mtx_init(&sc->sc_done_mtx, "gmirror:done", NULL, MTX_DEF);
sc->sc_state = G_MIRROR_DEVICE_STATE_STARTING;
gp->softc = sc;
Index: head/sys/geom/raid3/g_raid3.c
===================================================================
--- head/sys/geom/raid3/g_raid3.c
+++ head/sys/geom/raid3/g_raid3.c
@@ -3156,7 +3156,7 @@
bioq_init(&sc->sc_sync_delayed);
TAILQ_INIT(&sc->sc_events);
mtx_init(&sc->sc_events_mtx, "graid3:events", NULL, MTX_DEF);
- callout_init(&sc->sc_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_callout, 1);
sc->sc_state = G_RAID3_DEVICE_STATE_STARTING;
gp->softc = sc;
sc->sc_geom = gp;
Index: head/sys/geom/sched/gs_rr.c
===================================================================
--- head/sys/geom/sched/gs_rr.c
+++ head/sys/geom/sched/gs_rr.c
@@ -602,7 +602,7 @@
sc = malloc(sizeof *sc, M_GEOM_SCHED, M_NOWAIT | M_ZERO);
sc->sc_geom = geom;
TAILQ_INIT(&sc->sc_rr_tailq);
- callout_init(&sc->sc_wait, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_wait, 1);
LIST_INSERT_HEAD(&me.sc_head, sc, sc_next);
me.units++;
Index: head/sys/i386/i386/mp_watchdog.c
===================================================================
--- head/sys/i386/i386/mp_watchdog.c
+++ head/sys/i386/i386/mp_watchdog.c
@@ -85,7 +85,7 @@
watchdog_init(void *arg)
{
- callout_init(&watchdog_callout, CALLOUT_MPSAFE);
+ callout_init(&watchdog_callout, 1);
if (watchdog_cpu != -1)
watchdog_change(watchdog_cpu);
}
Index: head/sys/kern/init_main.c
===================================================================
--- head/sys/kern/init_main.c
+++ head/sys/kern/init_main.c
@@ -506,7 +506,7 @@
callout_init_mtx(&p->p_itcallout, &p->p_mtx, 0);
callout_init_mtx(&p->p_limco, &p->p_mtx, 0);
- callout_init(&td->td_slpcallout, CALLOUT_MPSAFE);
+ callout_init(&td->td_slpcallout, 1);
/* Create credentials. */
newcred = crget();
Index: head/sys/kern/kern_cons.c
===================================================================
--- head/sys/kern/kern_cons.c
+++ head/sys/kern/kern_cons.c
@@ -654,7 +654,7 @@
sysbeep_init(void *unused)
{
- callout_init(&beeping_timer, CALLOUT_MPSAFE);
+ callout_init(&beeping_timer, 1);
}
SYSINIT(sysbeep, SI_SUB_SOFTINTR, SI_ORDER_ANY, sysbeep_init, NULL);
#else
Index: head/sys/kern/kern_event.c
===================================================================
--- head/sys/kern/kern_event.c
+++ head/sys/kern/kern_event.c
@@ -615,7 +615,7 @@
kn->kn_status &= ~KN_DETACHED; /* knlist_add clears it */
kn->kn_ptr.p_nexttime = malloc(sizeof(sbintime_t), M_KQUEUE, M_WAITOK);
calloutp = malloc(sizeof(*calloutp), M_KQUEUE, M_WAITOK);
- callout_init(calloutp, CALLOUT_MPSAFE);
+ callout_init(calloutp, 1);
kn->kn_hook = calloutp;
*kn->kn_ptr.p_nexttime = to + sbinuptime();
callout_reset_sbt_on(calloutp, *kn->kn_ptr.p_nexttime, 0,
Index: head/sys/kern/kern_synch.c
===================================================================
--- head/sys/kern/kern_synch.c
+++ head/sys/kern/kern_synch.c
@@ -556,7 +556,7 @@
static void
synch_setup(void *dummy)
{
- callout_init(&loadav_callout, CALLOUT_MPSAFE);
+ callout_init(&loadav_callout, 1);
/* Kick off timeout driven events by calling first time. */
loadav(NULL);
Index: head/sys/kern/kern_thread.c
===================================================================
--- head/sys/kern/kern_thread.c
+++ head/sys/kern/kern_thread.c
@@ -546,7 +546,7 @@
LIST_INIT(&td->td_lprof[0]);
LIST_INIT(&td->td_lprof[1]);
sigqueue_init(&td->td_sigqueue, p);
- callout_init(&td->td_slpcallout, CALLOUT_MPSAFE);
+ callout_init(&td->td_slpcallout, 1);
TAILQ_INSERT_TAIL(&p->p_threads, td, td_plist);
p->p_numthreads++;
}
Index: head/sys/kern/subr_vmem.c
===================================================================
--- head/sys/kern/subr_vmem.c
+++ head/sys/kern/subr_vmem.c
@@ -766,7 +766,7 @@
TASK_INIT(&vmem_periodic_wk, 0, vmem_periodic, NULL);
vmem_periodic_interval = hz * 10;
- callout_init(&vmem_periodic_ch, CALLOUT_MPSAFE);
+ callout_init(&vmem_periodic_ch, 1);
callout_reset(&vmem_periodic_ch, vmem_periodic_interval,
vmem_periodic_kick, NULL);
}
Index: head/sys/kern/uipc_domain.c
===================================================================
--- head/sys/kern/uipc_domain.c
+++ head/sys/kern/uipc_domain.c
@@ -248,8 +248,8 @@
if (max_linkhdr < 16) /* XXX */
max_linkhdr = 16;
- callout_init(&pffast_callout, CALLOUT_MPSAFE);
- callout_init(&pfslow_callout, CALLOUT_MPSAFE);
+ callout_init(&pffast_callout, 1);
+ callout_init(&pfslow_callout, 1);
mtx_lock(&dom_mtx);
KASSERT(domain_init_status == 0, ("domaininit called too late!"));
Index: head/sys/mips/cavium/octe/ethernet.c
===================================================================
--- head/sys/mips/cavium/octe/ethernet.c
+++ head/sys/mips/cavium/octe/ethernet.c
@@ -455,7 +455,7 @@
cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0x1001);
}
- callout_init(&cvm_oct_poll_timer, CALLOUT_MPSAFE);
+ callout_init(&cvm_oct_poll_timer, 1);
callout_reset(&cvm_oct_poll_timer, hz, cvm_do_timer, NULL);
return 0;
Index: head/sys/mips/cavium/octeon_rnd.c
===================================================================
--- head/sys/mips/cavium/octeon_rnd.c
+++ head/sys/mips/cavium/octeon_rnd.c
@@ -95,7 +95,7 @@
struct octeon_rnd_softc *sc;
sc = device_get_softc(dev);
- callout_init(&sc->sc_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_callout, 1);
callout_reset(&sc->sc_callout, hz * 5, octeon_rnd_harvest, sc);
cvmx_rng_enable();
Index: head/sys/mips/nlm/dev/net/xlpge.c
===================================================================
--- head/sys/mips/nlm/dev/net/xlpge.c
+++ head/sys/mips/nlm/dev/net/xlpge.c
@@ -1240,7 +1240,7 @@
sc->prepad_en = sc->network_sc->prepad_en;
sc->prepad_size = sc->network_sc->prepad_size;
- callout_init(&sc->xlpge_callout, CALLOUT_MPSAFE);
+ callout_init(&sc->xlpge_callout, 1);
XLPGE_LOCK_INIT(sc, device_get_nameunit(dev));
Index: head/sys/mips/rmi/dev/xlr/rge.c
===================================================================
--- head/sys/mips/rmi/dev/xlr/rge.c
+++ head/sys/mips/rmi/dev/xlr/rge.c
@@ -1894,9 +1894,9 @@
if (!gmac_common_init_done) {
mac_common_init();
gmac_common_init_done = 1;
- callout_init(&xlr_tx_stop_bkp, CALLOUT_MPSAFE);
+ callout_init(&xlr_tx_stop_bkp, 1);
callout_reset(&xlr_tx_stop_bkp, hz, xlr_tx_q_wakeup, NULL);
- callout_init(&rge_dbg_count, CALLOUT_MPSAFE);
+ callout_init(&rge_dbg_count, 1);
//callout_reset(&rge_dbg_count, hz, xlr_debug_count, NULL);
}
if ((ret = rmi_xlr_mac_open(sc)) == -1) {
Index: head/sys/net/if_spppsubr.c
===================================================================
--- head/sys/net/if_spppsubr.c
+++ head/sys/net/if_spppsubr.c
@@ -1005,7 +1005,7 @@
mtx_init(&sp->mtx, "sppp", MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE);
/* Initialize keepalive handler. */
- callout_init(&sp->keepalive_callout, CALLOUT_MPSAFE);
+ callout_init(&sp->keepalive_callout, 1);
callout_reset(&sp->keepalive_callout, hz * 10, sppp_keepalive,
(void *)sp);
@@ -1037,7 +1037,7 @@
#ifdef INET6
sp->confflags |= CONF_ENABLE_IPV6;
#endif
- callout_init(&sp->ifstart_callout, CALLOUT_MPSAFE);
+ callout_init(&sp->ifstart_callout, 1);
sp->if_start = ifp->if_start;
ifp->if_start = sppp_ifstart;
sp->pp_comp = malloc(sizeof(struct slcompress), M_TEMP, M_WAITOK);
@@ -2145,7 +2145,7 @@
sp->lcp.max_terminate = 2;
sp->lcp.max_configure = 10;
sp->lcp.max_failure = 10;
- callout_init(&sp->ch[IDX_LCP], CALLOUT_MPSAFE);
+ callout_init(&sp->ch[IDX_LCP], 1);
}
static void
@@ -2836,7 +2836,7 @@
sp->fail_counter[IDX_IPCP] = 0;
sp->pp_seq[IDX_IPCP] = 0;
sp->pp_rseq[IDX_IPCP] = 0;
- callout_init(&sp->ch[IDX_IPCP], CALLOUT_MPSAFE);
+ callout_init(&sp->ch[IDX_IPCP], 1);
}
static void
@@ -3395,7 +3395,7 @@
sp->fail_counter[IDX_IPV6CP] = 0;
sp->pp_seq[IDX_IPV6CP] = 0;
sp->pp_rseq[IDX_IPV6CP] = 0;
- callout_init(&sp->ch[IDX_IPV6CP], CALLOUT_MPSAFE);
+ callout_init(&sp->ch[IDX_IPV6CP], 1);
}
static void
@@ -4200,7 +4200,7 @@
sp->fail_counter[IDX_CHAP] = 0;
sp->pp_seq[IDX_CHAP] = 0;
sp->pp_rseq[IDX_CHAP] = 0;
- callout_init(&sp->ch[IDX_CHAP], CALLOUT_MPSAFE);
+ callout_init(&sp->ch[IDX_CHAP], 1);
}
static void
@@ -4522,8 +4522,8 @@
sp->fail_counter[IDX_PAP] = 0;
sp->pp_seq[IDX_PAP] = 0;
sp->pp_rseq[IDX_PAP] = 0;
- callout_init(&sp->ch[IDX_PAP], CALLOUT_MPSAFE);
- callout_init(&sp->pap_my_to_ch, CALLOUT_MPSAFE);
+ callout_init(&sp->ch[IDX_PAP], 1);
+ callout_init(&sp->pap_my_to_ch, 1);
}
static void
Index: head/sys/net80211/ieee80211_ht.c
===================================================================
--- head/sys/net80211/ieee80211_ht.c
+++ head/sys/net80211/ieee80211_ht.c
@@ -1691,7 +1691,7 @@
static void
ampdu_tx_setup(struct ieee80211_tx_ampdu *tap)
{
- callout_init(&tap->txa_timer, CALLOUT_MPSAFE);
+ callout_init(&tap->txa_timer, 1);
tap->txa_flags |= IEEE80211_AGGR_SETUP;
tap->txa_lastsample = ticks;
}
Index: head/sys/net80211/ieee80211_hwmp.c
===================================================================
--- head/sys/net80211/ieee80211_hwmp.c
+++ head/sys/net80211/ieee80211_hwmp.c
@@ -275,7 +275,7 @@
return;
}
hs->hs_maxhops = IEEE80211_HWMP_DEFAULT_MAXHOPS;
- callout_init(&hs->hs_roottimer, CALLOUT_MPSAFE);
+ callout_init(&hs->hs_roottimer, 1);
vap->iv_hwmp = hs;
}
Index: head/sys/net80211/ieee80211_mesh.c
===================================================================
--- head/sys/net80211/ieee80211_mesh.c
+++ head/sys/net80211/ieee80211_mesh.c
@@ -217,7 +217,7 @@
IEEE80211_ADDR_COPY(rt->rt_dest, dest);
rt->rt_priv = (void *)ALIGN(&rt[1]);
mtx_init(&rt->rt_lock, "MBSS_RT", "802.11s route entry", MTX_DEF);
- callout_init(&rt->rt_discovery, CALLOUT_MPSAFE);
+ callout_init(&rt->rt_discovery, 1);
rt->rt_updtime = ticks; /* create time */
TAILQ_INSERT_TAIL(&ms->ms_routes, rt, rt_next);
}
@@ -679,8 +679,8 @@
TAILQ_INIT(&ms->ms_known_gates);
TAILQ_INIT(&ms->ms_routes);
mtx_init(&ms->ms_rt_lock, "MBSS", "802.11s routing table", MTX_DEF);
- callout_init(&ms->ms_cleantimer, CALLOUT_MPSAFE);
- callout_init(&ms->ms_gatetimer, CALLOUT_MPSAFE);
+ callout_init(&ms->ms_cleantimer, 1);
+ callout_init(&ms->ms_gatetimer, 1);
ms->ms_gateseq = 0;
mesh_select_proto_metric(vap, "AIRTIME");
KASSERT(ms->ms_pmetric, ("ms_pmetric == NULL"));
@@ -3384,8 +3384,8 @@
ieee80211_mesh_node_init(struct ieee80211vap *vap, struct ieee80211_node *ni)
{
ni->ni_flags |= IEEE80211_NODE_QOS;
- callout_init(&ni->ni_mltimer, CALLOUT_MPSAFE);
- callout_init(&ni->ni_mlhtimer, CALLOUT_MPSAFE);
+ callout_init(&ni->ni_mltimer, 1);
+ callout_init(&ni->ni_mlhtimer, 1);
}
/*
Index: head/sys/net80211/ieee80211_node.c
===================================================================
--- head/sys/net80211/ieee80211_node.c
+++ head/sys/net80211/ieee80211_node.c
@@ -114,7 +114,7 @@
"802.11 staging q");
ieee80211_node_table_init(ic, &ic->ic_sta, "station",
IEEE80211_INACT_INIT, ic->ic_max_keyix);
- callout_init(&ic->ic_inact, CALLOUT_MPSAFE);
+ callout_init(&ic->ic_inact, 1);
callout_reset(&ic->ic_inact, IEEE80211_INACT_WAIT*hz,
ieee80211_node_timeout, ic);
Index: head/sys/net80211/ieee80211_proto.c
===================================================================
--- head/sys/net80211/ieee80211_proto.c
+++ head/sys/net80211/ieee80211_proto.c
@@ -195,7 +195,7 @@
vap->iv_fragthreshold = IEEE80211_FRAG_DEFAULT;
vap->iv_bmiss_max = IEEE80211_BMISS_MAX;
callout_init_mtx(&vap->iv_swbmiss, IEEE80211_LOCK_OBJ(ic), 0);
- callout_init(&vap->iv_mgtsend, CALLOUT_MPSAFE);
+ callout_init(&vap->iv_mgtsend, 1);
TASK_INIT(&vap->iv_nstate_task, 0, ieee80211_newstate_cb, vap);
TASK_INIT(&vap->iv_swbmiss_task, 0, beacon_swmiss, vap);
/*
Index: head/sys/netgraph/netflow/ng_netflow.c
===================================================================
--- head/sys/netgraph/netflow/ng_netflow.c
+++ head/sys/netgraph/netflow/ng_netflow.c
@@ -259,7 +259,7 @@
priv->ifaces[i].info.conf = NG_NETFLOW_CONF_INGRESS;
/* Initialize callout handle */
- callout_init(&priv->exp_callout, CALLOUT_MPSAFE);
+ callout_init(&priv->exp_callout, 1);
/* Allocate memory and set up flow cache */
ng_netflow_cache_init(priv);
Index: head/sys/netgraph/netgraph.h
===================================================================
--- head/sys/netgraph/netgraph.h
+++ head/sys/netgraph/netgraph.h
@@ -1161,7 +1161,7 @@
int ng_uncallout(struct callout *c, node_p node);
int ng_callout(struct callout *c, node_p node, hook_p hook, int ticks,
ng_item_fn *fn, void * arg1, int arg2);
-#define ng_callout_init(c) callout_init(c, CALLOUT_MPSAFE)
+#define ng_callout_init(c) callout_init(c, 1)
/* Flags for netgraph functions. */
#define NG_NOFLAGS 0x00000000 /* no special options */
Index: head/sys/netinet/in_pcb.c
===================================================================
--- head/sys/netinet/in_pcb.c
+++ head/sys/netinet/in_pcb.c
@@ -2249,7 +2249,7 @@
{
/* Start ipport_tick. */
- callout_init(&ipport_tick_callout, CALLOUT_MPSAFE);
+ callout_init(&ipport_tick_callout, 1);
callout_reset(&ipport_tick_callout, 1, ipport_tick, NULL);
EVENTHANDLER_REGISTER(shutdown_pre_sync, ip_fini, NULL,
SHUTDOWN_PRI_DEFAULT);
Index: head/sys/netinet/ip_mroute.c
===================================================================
--- head/sys/netinet/ip_mroute.c
+++ head/sys/netinet/ip_mroute.c
@@ -2816,9 +2816,9 @@
MALLOC(V_nexpire, u_char *, mfchashsize, M_MRTABLE, M_WAITOK|M_ZERO);
bzero(V_bw_meter_timers, sizeof(V_bw_meter_timers));
- callout_init(&V_expire_upcalls_ch, CALLOUT_MPSAFE);
- callout_init(&V_bw_upcalls_ch, CALLOUT_MPSAFE);
- callout_init(&V_bw_meter_ch, CALLOUT_MPSAFE);
+ callout_init(&V_expire_upcalls_ch, 1);
+ callout_init(&V_bw_upcalls_ch, 1);
+ callout_init(&V_bw_meter_ch, 1);
}
VNET_SYSINIT(vnet_mroute_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_mroute_init,
Index: head/sys/netinet/tcp_hostcache.c
===================================================================
--- head/sys/netinet/tcp_hostcache.c
+++ head/sys/netinet/tcp_hostcache.c
@@ -238,7 +238,7 @@
/*
* Set up periodic cache cleanup.
*/
- callout_init(&V_tcp_hc_callout, CALLOUT_MPSAFE);
+ callout_init(&V_tcp_hc_callout, 1);
callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz,
tcp_hc_purge, curvnet);
}
Index: head/sys/netinet/tcp_subr.c
===================================================================
--- head/sys/netinet/tcp_subr.c
+++ head/sys/netinet/tcp_subr.c
@@ -791,11 +791,11 @@
V_tcp_mssdflt;
/* Set up our timeouts. */
- callout_init(&tp->t_timers->tt_rexmt, CALLOUT_MPSAFE);
- callout_init(&tp->t_timers->tt_persist, CALLOUT_MPSAFE);
- callout_init(&tp->t_timers->tt_keep, CALLOUT_MPSAFE);
- callout_init(&tp->t_timers->tt_2msl, CALLOUT_MPSAFE);
- callout_init(&tp->t_timers->tt_delack, CALLOUT_MPSAFE);
+ callout_init(&tp->t_timers->tt_rexmt, 1);
+ callout_init(&tp->t_timers->tt_persist, 1);
+ callout_init(&tp->t_timers->tt_keep, 1);
+ callout_init(&tp->t_timers->tt_2msl, 1);
+ callout_init(&tp->t_timers->tt_delack, 1);
if (V_tcp_do_rfc1323)
tp->t_flags = (TF_REQ_SCALE|TF_REQ_TSTMP);
Index: head/sys/netinet6/in6_rmx.c
===================================================================
--- head/sys/netinet6/in6_rmx.c
+++ head/sys/netinet6/in6_rmx.c
@@ -263,7 +263,7 @@
rnh->rnh_addaddr = in6_addroute;
if (V__in6_rt_was_here == 0) {
- callout_init(&V_rtq_mtutimer, CALLOUT_MPSAFE);
+ callout_init(&V_rtq_mtutimer, 1);
in6_mtutimo(curvnet); /* kick off timeout first time */
V__in6_rt_was_here = 1;
}
Index: head/sys/netipsec/key.c
===================================================================
--- head/sys/netipsec/key.c
+++ head/sys/netipsec/key.c
@@ -7560,7 +7560,7 @@
SPACQ_LOCK_INIT();
#ifndef IPSEC_DEBUG2
- callout_init(&key_timer, CALLOUT_MPSAFE);
+ callout_init(&key_timer, 1);
callout_reset(&key_timer, hz, key_timehandler, NULL);
#endif /*IPSEC_DEBUG2*/
Index: head/sys/netpfil/ipfw/ip_dummynet.c
===================================================================
--- head/sys/netpfil/ipfw/ip_dummynet.c
+++ head/sys/netpfil/ipfw/ip_dummynet.c
@@ -2169,7 +2169,7 @@
taskqueue_thread_enqueue, &dn_tq);
taskqueue_start_threads(&dn_tq, 1, PI_NET, "dummynet");
- callout_init(&dn_timeout, CALLOUT_MPSAFE);
+ callout_init(&dn_timeout, 1);
dn_reschedule();
/* Initialize curr_time adjustment mechanics. */
Index: head/sys/netpfil/ipfw/ip_fw_dynamic.c
===================================================================
--- head/sys/netpfil/ipfw/ip_fw_dynamic.c
+++ head/sys/netpfil/ipfw/ip_fw_dynamic.c
@@ -1395,7 +1395,7 @@
/* Enforce limit on dynamic rules */
uma_zone_set_max(V_ipfw_dyn_rule_zone, V_dyn_max);
- callout_init(&V_ipfw_timeout, CALLOUT_MPSAFE);
+ callout_init(&V_ipfw_timeout, 1);
/*
* This can potentially be done on first dynamic rule
Index: head/sys/netpfil/pf/if_pfsync.c
===================================================================
--- head/sys/netpfil/pf/if_pfsync.c
+++ head/sys/netpfil/pf/if_pfsync.c
@@ -324,7 +324,7 @@
ifp->if_mtu = ETHERMTU;
mtx_init(&sc->sc_mtx, pfsyncname, NULL, MTX_DEF);
mtx_init(&sc->sc_bulk_mtx, "pfsync bulk", NULL, MTX_DEF);
- callout_init(&sc->sc_tmo, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_tmo, 1);
callout_init_mtx(&sc->sc_bulk_tmo, &sc->sc_bulk_mtx, 0);
callout_init_mtx(&sc->sc_bulkfail_tmo, &sc->sc_bulk_mtx, 0);
Index: head/sys/ofed/include/linux/timer.h
===================================================================
--- head/sys/ofed/include/linux/timer.h
+++ head/sys/ofed/include/linux/timer.h
@@ -48,14 +48,14 @@
do { \
(timer)->function = (func); \
(timer)->data = (dat); \
- callout_init(&(timer)->timer_callout, CALLOUT_MPSAFE); \
+ callout_init(&(timer)->timer_callout, 1); \
} while (0)
#define init_timer(timer) \
do { \
(timer)->function = NULL; \
(timer)->data = 0; \
- callout_init(&(timer)->timer_callout, CALLOUT_MPSAFE); \
+ callout_init(&(timer)->timer_callout, 1); \
} while (0)
extern void mod_timer(struct timer_list *, unsigned long);
Index: head/sys/ofed/include/linux/workqueue.h
===================================================================
--- head/sys/ofed/include/linux/workqueue.h
+++ head/sys/ofed/include/linux/workqueue.h
@@ -78,7 +78,7 @@
#define INIT_DELAYED_WORK(_work, func) \
do { \
INIT_WORK(&(_work)->work, func); \
- callout_init(&(_work)->timer, CALLOUT_MPSAFE); \
+ callout_init(&(_work)->timer, 1); \
} while (0)
#define INIT_DEFERRABLE_WORK INIT_DELAYED_WORK
Index: head/sys/powerpc/mambo/mambo_console.c
===================================================================
--- head/sys/powerpc/mambo/mambo_console.c
+++ head/sys/powerpc/mambo/mambo_console.c
@@ -89,7 +89,7 @@
polltime = 1;
- callout_init(&mambo_callout, CALLOUT_MPSAFE);
+ callout_init(&mambo_callout, 1);
callout_reset(&mambo_callout, polltime, mambo_timeout, NULL);
}
}
Index: head/sys/powerpc/pseries/phyp_console.c
===================================================================
--- head/sys/powerpc/pseries/phyp_console.c
+++ head/sys/powerpc/pseries/phyp_console.c
@@ -256,7 +256,7 @@
bus_setup_intr(dev, sc->irqres, INTR_TYPE_TTY | INTR_MPSAFE,
NULL, uart_phyp_intr, sc, &sc->sc_icookie);
} else {
- callout_init(&sc->callout, CALLOUT_MPSAFE);
+ callout_init(&sc->callout, 1);
sc->polltime = hz / 20;
if (sc->polltime < 1)
sc->polltime = 1;
Index: head/sys/sys/callout.h
===================================================================
--- head/sys/sys/callout.h
+++ head/sys/sys/callout.h
@@ -43,7 +43,7 @@
#define CALLOUT_LOCAL_ALLOC 0x0001 /* was allocated from callfree */
#define CALLOUT_ACTIVE 0x0002 /* callout is currently active */
#define CALLOUT_PENDING 0x0004 /* callout is waiting for timeout */
-#define CALLOUT_MPSAFE 0x0008 /* callout handler is mp safe */
+#define CALLOUT_MPSAFE 0x0008 /* deprecated */
#define CALLOUT_RETURNUNLOCKED 0x0010 /* handler returns with mtx unlocked */
#define CALLOUT_SHAREDLOCK 0x0020 /* callout lock held in shared mode */
#define CALLOUT_DFRMIGRATION 0x0040 /* callout in deferred migration mode */
Index: head/sys/vm/uma_core.c
===================================================================
--- head/sys/vm/uma_core.c
+++ head/sys/vm/uma_core.c
@@ -1891,7 +1891,7 @@
#ifdef UMA_DEBUG
printf("Starting callout.\n");
#endif
- callout_init(&uma_callout, CALLOUT_MPSAFE);
+ callout_init(&uma_callout, 1);
callout_reset(&uma_callout, UMA_TIMEOUT * hz, uma_timeout, NULL);
#ifdef UMA_DEBUG
printf("UMA startup3 complete.\n");
Index: head/sys/x86/x86/mca.c
===================================================================
--- head/sys/x86/x86/mca.c
+++ head/sys/x86/x86/mca.c
@@ -762,7 +762,7 @@
mtx_init(&mca_lock, "mca", NULL, MTX_SPIN);
STAILQ_INIT(&mca_records);
TASK_INIT(&mca_scan_task, 0, mca_scan_cpus, NULL);
- callout_init(&mca_timer, CALLOUT_MPSAFE);
+ callout_init(&mca_timer, 1);
STAILQ_INIT(&mca_freelist);
TASK_INIT(&mca_refill_task, 0, mca_refill, NULL);
mca_fill_freelist();

File Metadata

Mime Type
text/plain
Expires
Mon, Jul 13, 8:23 PM (14 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35044159
Default Alt Text
D2613.diff (53 KB)

Event Timeline