svn commit: r314667 - in stable/10/sys: amd64/amd64 cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/common/fs/zfs cddl/dev/profile compat/ndis contrib/ipfilter/netinet dev/a...
Andriy Gapon
avg at FreeBSD.org
Sat Mar 4 13:03:40 UTC 2017
Author: avg
Date: Sat Mar 4 13:03:31 2017
New Revision: 314667
URL: https://svnweb.freebsd.org/changeset/base/314667
Log:
MFC r283291: don't use CALLOUT_MPSAFE with callout_init()
The main purpose of this MFC is to reduce conflicts for other merges.
Parts of the original change have already "trickled down" via individual MFCs.
Modified:
stable/10/sys/amd64/amd64/mp_watchdog.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
stable/10/sys/cddl/dev/profile/profile.c
stable/10/sys/compat/ndis/subr_ntoskrnl.c
stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
stable/10/sys/dev/ath/if_ath.c
stable/10/sys/dev/ce/if_ce.c
stable/10/sys/dev/cp/if_cp.c
stable/10/sys/dev/ctau/if_ct.c
stable/10/sys/dev/cx/if_cx.c
stable/10/sys/dev/cxgb/cxgb_main.c
stable/10/sys/dev/cxgb/cxgb_sge.c
stable/10/sys/dev/dcons/dcons_os.c
stable/10/sys/dev/drm2/drm_irq.c
stable/10/sys/dev/drm2/i915/intel_display.c
stable/10/sys/dev/glxsb/glxsb.c
stable/10/sys/dev/gxemul/cons/gxemul_cons.c
stable/10/sys/dev/hifn/hifn7751.c
stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
stable/10/sys/dev/if_ndis/if_ndis.c
stable/10/sys/dev/isci/isci_io_request.c
stable/10/sys/dev/mfi/mfi.c
stable/10/sys/dev/mwl/if_mwl.c
stable/10/sys/dev/nand/nandsim_chip.c
stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c
stable/10/sys/dev/nxge/if_nxge.c
stable/10/sys/dev/oce/oce_if.c
stable/10/sys/dev/patm/if_patm_attach.c
stable/10/sys/dev/rndtest/rndtest.c
stable/10/sys/dev/safe/safe.c
stable/10/sys/dev/sound/midi/mpu401.c
stable/10/sys/dev/sound/pci/atiixp.c
stable/10/sys/dev/sound/pci/es137x.c
stable/10/sys/dev/sound/pci/hda/hdaa.c
stable/10/sys/dev/sound/pci/hda/hdac.c
stable/10/sys/dev/sound/pci/via8233.c
stable/10/sys/dev/twa/tw_osl_freebsd.c
stable/10/sys/dev/tws/tws.c
stable/10/sys/dev/ubsec/ubsec.c
stable/10/sys/dev/virtio/random/virtio_random.c
stable/10/sys/dev/xen/netfront/netfront.c
stable/10/sys/fs/nfs/nfs_commonport.c
stable/10/sys/gdb/gdb_cons.c
stable/10/sys/geom/gate/g_gate.c
stable/10/sys/geom/journal/g_journal.c
stable/10/sys/geom/mirror/g_mirror.c
stable/10/sys/geom/raid3/g_raid3.c
stable/10/sys/geom/sched/gs_rr.c
stable/10/sys/i386/i386/mp_watchdog.c
stable/10/sys/kern/init_main.c
stable/10/sys/kern/kern_synch.c
stable/10/sys/kern/kern_thread.c
stable/10/sys/kern/subr_vmem.c
stable/10/sys/kern/uipc_domain.c
stable/10/sys/mips/cavium/octe/ethernet.c
stable/10/sys/mips/cavium/octeon_rnd.c
stable/10/sys/mips/nlm/dev/net/xlpge.c
stable/10/sys/mips/rmi/dev/xlr/rge.c
stable/10/sys/net/if_spppsubr.c
stable/10/sys/net80211/ieee80211_ht.c
stable/10/sys/net80211/ieee80211_hwmp.c
stable/10/sys/net80211/ieee80211_mesh.c
stable/10/sys/net80211/ieee80211_node.c
stable/10/sys/net80211/ieee80211_proto.c
stable/10/sys/netgraph/netflow/ng_netflow.c
stable/10/sys/netgraph/netgraph.h
stable/10/sys/netinet/in_pcb.c
stable/10/sys/netinet/ip_mroute.c
stable/10/sys/netinet/tcp_hostcache.c
stable/10/sys/netinet/tcp_subr.c
stable/10/sys/netinet6/in6_rmx.c
stable/10/sys/netpfil/ipfw/ip_dummynet.c
stable/10/sys/netpfil/ipfw/ip_fw_dynamic.c
stable/10/sys/netpfil/pf/if_pfsync.c
stable/10/sys/ofed/include/linux/timer.h
stable/10/sys/ofed/include/linux/workqueue.h
stable/10/sys/powerpc/mambo/mambo_console.c
stable/10/sys/powerpc/pseries/phyp_console.c
stable/10/sys/sys/callout.h
stable/10/sys/vm/uma_core.c
stable/10/sys/x86/x86/mca.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/amd64/mp_watchdog.c
==============================================================================
--- stable/10/sys/amd64/amd64/mp_watchdog.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/amd64/amd64/mp_watchdog.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -86,7 +86,7 @@ static void
watchdog_init(void *arg)
{
- callout_init(&watchdog_callout, CALLOUT_MPSAFE);
+ callout_init(&watchdog_callout, 1);
if (watchdog_cpu != -1)
watchdog_change(watchdog_cpu);
}
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -14284,8 +14284,8 @@ dtrace_state_create(struct cdev *dev)
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;
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -698,7 +698,7 @@ spa_add(const char *name, nvlist_t *conf
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);
Modified: stable/10/sys/cddl/dev/profile/profile.c
==============================================================================
--- stable/10/sys/cddl/dev/profile/profile.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/cddl/dev/profile/profile.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -330,7 +330,7 @@ profile_create(hrtime_t interval, char *
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,
@@ -578,7 +578,7 @@ profile_enable_omni(profile_probe_t *pro
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);
Modified: stable/10/sys/compat/ndis/subr_ntoskrnl.c
==============================================================================
--- stable/10/sys/compat/ndis/subr_ntoskrnl.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/compat/ndis/subr_ntoskrnl.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -3746,7 +3746,7 @@ ntoskrnl_insert_timer(timer, ticks)
timer->k_callout = c;
- callout_init(c, CALLOUT_MPSAFE);
+ callout_init(c, 1);
callout_reset(c, ticks, ntoskrnl_timercall, timer);
}
Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -190,7 +190,7 @@ ipf_timer_func(arg)
#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);
@@ -238,7 +238,7 @@ ipfattach(softc)
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;
Modified: stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
==============================================================================
--- stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -454,11 +454,11 @@ altera_jtag_uart_attach(struct altera_jt
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);
Modified: stable/10/sys/dev/ath/if_ath.c
==============================================================================
--- stable/10/sys/dev/ath/if_ath.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/ath/if_ath.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -547,7 +547,7 @@ ath_attach(u_int16_t devid, struct ath_s
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.
Modified: stable/10/sys/dev/ce/if_ce.c
==============================================================================
--- stable/10/sys/dev/ce/if_ce.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/ce/if_ce.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -103,10 +103,6 @@ __FBSDID("$FreeBSD$");
#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; \
@@ -625,7 +621,7 @@ static int ce_attach (device_t dev)
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
@@ -677,7 +673,7 @@ static int ce_attach (device_t dev)
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);
@@ -2580,7 +2576,7 @@ static int ce_modevent (module_t mod, in
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
Modified: stable/10/sys/dev/cp/if_cp.c
==============================================================================
--- stable/10/sys/dev/cp/if_cp.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/cp/if_cp.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -461,7 +461,7 @@ static int cp_attach (device_t dev)
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);
@@ -490,7 +490,7 @@ static int cp_attach (device_t dev)
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);
@@ -2240,7 +2240,7 @@ static int cp_modevent (module_t mod, in
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:
Modified: stable/10/sys/dev/ctau/if_ct.c
==============================================================================
--- stable/10/sys/dev/ctau/if_ct.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/ctau/if_ct.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -663,7 +663,7 @@ static int ct_attach (device_t dev)
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,
@@ -702,7 +702,7 @@ static int ct_attach (device_t dev)
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) {
@@ -2180,7 +2180,7 @@ static int ct_modevent (module_t mod, in
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:
Modified: stable/10/sys/dev/cx/if_cx.c
==============================================================================
--- stable/10/sys/dev/cx/if_cx.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/cx/if_cx.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -762,7 +762,7 @@ static int cx_attach (device_t dev)
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,
@@ -812,7 +812,7 @@ static int cx_attach (device_t dev)
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);
@@ -883,7 +883,7 @@ static int cx_attach (device_t dev)
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);
@@ -2514,7 +2514,7 @@ static int cx_modevent (module_t mod, in
#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,
Modified: stable/10/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/10/sys/dev/cxgb/cxgb_main.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/cxgb/cxgb_main.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1009,7 +1009,7 @@ cxgb_port_attach(device_t dev)
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 */
Modified: stable/10/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- stable/10/sys/dev/cxgb/cxgb_sge.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/cxgb/cxgb_sge.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1013,7 +1013,7 @@ sge_timer_cb(void *arg)
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);
Modified: stable/10/sys/dev/dcons/dcons_os.c
==============================================================================
--- stable/10/sys/dev/dcons/dcons_os.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/dcons/dcons_os.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -374,7 +374,7 @@ dcons_attach(void)
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);
Modified: stable/10/sys/dev/drm2/drm_irq.c
==============================================================================
--- stable/10/sys/dev/drm2/drm_irq.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/drm2/drm_irq.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -210,7 +210,7 @@ int drm_vblank_init(struct drm_device *d
{
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);
Modified: stable/10/sys/dev/drm2/i915/intel_display.c
==============================================================================
--- stable/10/sys/dev/drm2/i915/intel_display.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/drm2/i915/intel_display.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -6449,7 +6449,7 @@ static void intel_crtc_init(struct drm_d
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 @@ void intel_modeset_init(struct drm_devic
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)
Modified: stable/10/sys/dev/glxsb/glxsb.c
==============================================================================
--- stable/10/sys/dev/glxsb/glxsb.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/glxsb/glxsb.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -331,7 +331,7 @@ glxsb_attach(device_t dev)
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);
Modified: stable/10/sys/dev/gxemul/cons/gxemul_cons.c
==============================================================================
--- stable/10/sys/dev/gxemul/cons/gxemul_cons.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/gxemul/cons/gxemul_cons.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -279,7 +279,7 @@ gxemul_cons_ttyinit(void *unused)
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);
Modified: stable/10/sys/dev/hifn/hifn7751.c
==============================================================================
--- stable/10/sys/dev/hifn/hifn7751.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/hifn/hifn7751.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -590,7 +590,7 @@ hifn_attach(device_t dev)
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);
@@ -768,7 +768,7 @@ hifn_init_pubrng(struct hifn_softc *sc)
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);
}
Modified: stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
==============================================================================
--- stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1553,7 +1553,7 @@ storvsc_action(struct cam_sim *sim, unio
#ifdef notyet
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);
Modified: stable/10/sys/dev/if_ndis/if_ndis.c
==============================================================================
--- stable/10/sys/dev/if_ndis/if_ndis.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/if_ndis/if_ndis.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -557,7 +557,7 @@ ndis_attach(dev)
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);
@@ -733,7 +733,7 @@ ndis_attach(dev)
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;
Modified: stable/10/sys/dev/isci/isci_io_request.c
==============================================================================
--- stable/10/sys/dev/isci/isci_io_request.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/isci/isci_io_request.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -680,7 +680,7 @@ isci_request_construct(struct ISCI_REQUE
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
Modified: stable/10/sys/dev/mfi/mfi.c
==============================================================================
--- stable/10/sys/dev/mfi/mfi.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/mfi/mfi.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -788,7 +788,7 @@ mfi_attach(struct mfi_softc *sc)
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);
Modified: stable/10/sys/dev/mwl/if_mwl.c
==============================================================================
--- stable/10/sys/dev/mwl/if_mwl.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/mwl/if_mwl.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -368,7 +368,7 @@ mwl_attach(uint16_t devid, struct mwl_so
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,
Modified: stable/10/sys/dev/nand/nandsim_chip.c
==============================================================================
--- stable/10/sys/dev/nand/nandsim_chip.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/nand/nandsim_chip.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -94,7 +94,7 @@ nandsim_chip_init(struct nandsim_softc*
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;
Modified: stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c
==============================================================================
--- stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/ntb/ntb_hw/ntb_hw.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -662,8 +662,8 @@ intel_ntb_attach(device_t device)
ntb->msix_mw_idx = B2B_MW_DISABLED;
/* Heartbeat timer for NTB_ATOM 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);
callout_init(&ntb->peer_msix_work, 1);
mtx_init(&ntb->db_mask_lock, "ntb hw bits", NULL, MTX_SPIN);
Modified: stable/10/sys/dev/nxge/if_nxge.c
==============================================================================
--- stable/10/sys/dev/nxge/if_nxge.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/nxge/if_nxge.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1743,7 +1743,7 @@ xge_device_init(xge_lldev_t *lldev, xge_
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);
Modified: stable/10/sys/dev/oce/oce_if.c
==============================================================================
--- stable/10/sys/dev/oce/oce_if.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/oce/oce_if.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -341,7 +341,7 @@ oce_attach(device_t dev)
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;
Modified: stable/10/sys/dev/patm/if_patm_attach.c
==============================================================================
--- stable/10/sys/dev/patm/if_patm_attach.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/patm/if_patm_attach.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -207,7 +207,7 @@ patm_attach(device_t dev)
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);
Modified: stable/10/sys/dev/rndtest/rndtest.c
==============================================================================
--- stable/10/sys/dev/rndtest/rndtest.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/rndtest/rndtest.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -98,7 +98,7 @@ rndtest_attach(device_t dev)
#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");
Modified: stable/10/sys/dev/safe/safe.c
==============================================================================
--- stable/10/sys/dev/safe/safe.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/safe/safe.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -425,7 +425,7 @@ safe_attach(device_t dev)
#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 */
Modified: stable/10/sys/dev/sound/midi/mpu401.c
==============================================================================
--- stable/10/sys/dev/sound/midi/mpu401.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/sound/midi/mpu401.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -185,7 +185,7 @@ mpu401_init(kobj_class_t cls, void *cook
kobj_init((kobj_t)m, cls);
- callout_init(&m->timer, CALLOUT_MPSAFE);
+ callout_init(&m->timer, 1);
m->si = softintr;
m->cookie = cookie;
Modified: stable/10/sys/dev/sound/pci/atiixp.c
==============================================================================
--- stable/10/sys/dev/sound/pci/atiixp.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/sound/pci/atiixp.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1193,7 +1193,7 @@ atiixp_pci_attach(device_t dev)
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),
Modified: stable/10/sys/dev/sound/pci/es137x.c
==============================================================================
--- stable/10/sys/dev/sound/pci/es137x.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/sound/pci/es137x.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1741,7 +1741,7 @@ es_pci_attach(device_t dev)
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),
Modified: stable/10/sys/dev/sound/pci/hda/hdaa.c
==============================================================================
--- stable/10/sys/dev/sound/pci/hda/hdaa.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/sound/pci/hda/hdaa.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -6592,7 +6592,7 @@ hdaa_attach(device_t dev)
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);
Modified: stable/10/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- stable/10/sys/dev/sound/pci/hda/hdac.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/sound/pci/hda/hdac.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1116,7 +1116,7 @@ hdac_attach(device_t dev)
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) {
Modified: stable/10/sys/dev/sound/pci/via8233.c
==============================================================================
--- stable/10/sys/dev/sound/pci/via8233.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/sound/pci/via8233.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1175,7 +1175,7 @@ via_attach(device_t dev)
"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),
Modified: stable/10/sys/dev/twa/tw_osl_freebsd.c
==============================================================================
--- stable/10/sys/dev/twa/tw_osl_freebsd.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/twa/tw_osl_freebsd.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -423,8 +423,8 @@ twa_attach(device_t dev)
}
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);
Modified: stable/10/sys/dev/tws/tws.c
==============================================================================
--- stable/10/sys/dev/tws/tws.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/tws/tws.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -198,7 +198,7 @@ tws_attach(device_t dev)
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");
@@ -706,7 +706,7 @@ tws_init_reqs(struct tws_softc *sc, u_in
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);
Modified: stable/10/sys/dev/ubsec/ubsec.c
==============================================================================
--- stable/10/sys/dev/ubsec/ubsec.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/ubsec/ubsec.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -456,7 +456,7 @@ ubsec_attach(device_t dev)
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:
;
Modified: stable/10/sys/dev/virtio/random/virtio_random.c
==============================================================================
--- stable/10/sys/dev/virtio/random/virtio_random.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/virtio/random/virtio_random.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -129,7 +129,7 @@ vtrnd_attach(device_t dev)
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);
Modified: stable/10/sys/dev/xen/netfront/netfront.c
==============================================================================
--- stable/10/sys/dev/xen/netfront/netfront.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/dev/xen/netfront/netfront.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -2132,7 +2132,7 @@ create_netdev(device_t dev)
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);
Modified: stable/10/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- stable/10/sys/fs/nfs/nfs_commonport.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/fs/nfs/nfs_commonport.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -609,7 +609,7 @@ nfscommon_modevent(module_t mod, int typ
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;
Modified: stable/10/sys/gdb/gdb_cons.c
==============================================================================
--- stable/10/sys/gdb/gdb_cons.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/gdb/gdb_cons.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -77,7 +77,7 @@ gdb_cninit(struct consdev *cp)
/* 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;
}
}
Modified: stable/10/sys/geom/gate/g_gate.c
==============================================================================
--- stable/10/sys/geom/gate/g_gate.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/geom/gate/g_gate.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -487,7 +487,7 @@ g_gate_create(struct g_gate_ctl_create *
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);
Modified: stable/10/sys/geom/journal/g_journal.c
==============================================================================
--- stable/10/sys/geom/journal/g_journal.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/geom/journal/g_journal.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -2317,7 +2317,7 @@ g_journal_create(struct g_class *mp, str
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.
Modified: stable/10/sys/geom/mirror/g_mirror.c
==============================================================================
--- stable/10/sys/geom/mirror/g_mirror.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/geom/mirror/g_mirror.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -2966,7 +2966,7 @@ g_mirror_create(struct g_class *mp, cons
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;
Modified: stable/10/sys/geom/raid3/g_raid3.c
==============================================================================
--- stable/10/sys/geom/raid3/g_raid3.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/geom/raid3/g_raid3.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -3165,7 +3165,7 @@ g_raid3_create(struct g_class *mp, const
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;
Modified: stable/10/sys/geom/sched/gs_rr.c
==============================================================================
--- stable/10/sys/geom/sched/gs_rr.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/geom/sched/gs_rr.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -602,7 +602,7 @@ g_rr_init(struct g_geom *geom)
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++;
Modified: stable/10/sys/i386/i386/mp_watchdog.c
==============================================================================
--- stable/10/sys/i386/i386/mp_watchdog.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/i386/i386/mp_watchdog.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -86,7 +86,7 @@ static void
watchdog_init(void *arg)
{
- callout_init(&watchdog_callout, CALLOUT_MPSAFE);
+ callout_init(&watchdog_callout, 1);
if (watchdog_cpu != -1)
watchdog_change(watchdog_cpu);
}
Modified: stable/10/sys/kern/init_main.c
==============================================================================
--- stable/10/sys/kern/init_main.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/kern/init_main.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -511,7 +511,7 @@ proc0_init(void *dummy __unused)
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();
Modified: stable/10/sys/kern/kern_synch.c
==============================================================================
--- stable/10/sys/kern/kern_synch.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/kern/kern_synch.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -569,7 +569,7 @@ loadav(void *arg)
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);
Modified: stable/10/sys/kern/kern_thread.c
==============================================================================
--- stable/10/sys/kern/kern_thread.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/kern/kern_thread.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -551,7 +551,7 @@ thread_link(struct thread *td, struct pr
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_HEAD(&p->p_threads, td, td_plist);
p->p_numthreads++;
}
Modified: stable/10/sys/kern/subr_vmem.c
==============================================================================
--- stable/10/sys/kern/subr_vmem.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/kern/subr_vmem.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -766,7 +766,7 @@ vmem_start_callout(void *unused)
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);
}
Modified: stable/10/sys/kern/uipc_domain.c
==============================================================================
--- stable/10/sys/kern/uipc_domain.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/kern/uipc_domain.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -247,8 +247,8 @@ domaininit(void *dummy)
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!"));
Modified: stable/10/sys/mips/cavium/octe/ethernet.c
==============================================================================
--- stable/10/sys/mips/cavium/octe/ethernet.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/mips/cavium/octe/ethernet.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -454,7 +454,7 @@ int cvm_oct_init_module(device_t bus)
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;
Modified: stable/10/sys/mips/cavium/octeon_rnd.c
==============================================================================
--- stable/10/sys/mips/cavium/octeon_rnd.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/mips/cavium/octeon_rnd.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -95,7 +95,7 @@ octeon_rnd_attach(device_t dev)
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();
Modified: stable/10/sys/mips/nlm/dev/net/xlpge.c
==============================================================================
--- stable/10/sys/mips/nlm/dev/net/xlpge.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/mips/nlm/dev/net/xlpge.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1240,7 +1240,7 @@ nlm_xlpge_attach(device_t dev)
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));
Modified: stable/10/sys/mips/rmi/dev/xlr/rge.c
==============================================================================
--- stable/10/sys/mips/rmi/dev/xlr/rge.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/mips/rmi/dev/xlr/rge.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1894,9 +1894,9 @@ rge_attach(device_t dev)
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) {
Modified: stable/10/sys/net/if_spppsubr.c
==============================================================================
--- stable/10/sys/net/if_spppsubr.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/net/if_spppsubr.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1030,7 +1030,7 @@ sppp_attach(struct ifnet *ifp)
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);
@@ -1062,7 +1062,7 @@ sppp_attach(struct ifnet *ifp)
#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);
@@ -2170,7 +2170,7 @@ sppp_lcp_init(struct sppp *sp)
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
@@ -2861,7 +2861,7 @@ sppp_ipcp_init(struct sppp *sp)
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
@@ -3420,7 +3420,7 @@ sppp_ipv6cp_init(struct sppp *sp)
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
@@ -4225,7 +4225,7 @@ sppp_chap_init(struct sppp *sp)
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
@@ -4547,8 +4547,8 @@ sppp_pap_init(struct sppp *sp)
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
Modified: stable/10/sys/net80211/ieee80211_ht.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_ht.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/net80211/ieee80211_ht.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -1688,7 +1688,7 @@ ieee80211_setup_basic_htrates(struct iee
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;
}
Modified: stable/10/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_hwmp.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/net80211/ieee80211_hwmp.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -275,7 +275,7 @@ hwmp_vattach(struct ieee80211vap *vap)
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;
}
Modified: stable/10/sys/net80211/ieee80211_mesh.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_mesh.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/net80211/ieee80211_mesh.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -216,7 +216,7 @@ mesh_rt_add_locked(struct ieee80211vap *
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);
}
@@ -678,8 +678,8 @@ mesh_vattach(struct ieee80211vap *vap)
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"));
@@ -3382,8 +3382,8 @@ void
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);
}
/*
Modified: stable/10/sys/net80211/ieee80211_node.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_node.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/net80211/ieee80211_node.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -111,7 +111,7 @@ ieee80211_node_attach(struct ieee80211co
"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);
Modified: stable/10/sys/net80211/ieee80211_proto.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_proto.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/net80211/ieee80211_proto.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -194,7 +194,7 @@ ieee80211_proto_vattach(struct ieee80211
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);
/*
Modified: stable/10/sys/netgraph/netflow/ng_netflow.c
==============================================================================
--- stable/10/sys/netgraph/netflow/ng_netflow.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/netgraph/netflow/ng_netflow.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -258,7 +258,7 @@ ng_netflow_constructor(node_p node)
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);
Modified: stable/10/sys/netgraph/netgraph.h
==============================================================================
--- stable/10/sys/netgraph/netgraph.h Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/netgraph/netgraph.h Sat Mar 4 13:03:31 2017 (r314667)
@@ -1161,7 +1161,7 @@ int ng_send_fn2(node_p node, hook_p hoo
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 */
Modified: stable/10/sys/netinet/in_pcb.c
==============================================================================
--- stable/10/sys/netinet/in_pcb.c Sat Mar 4 12:51:57 2017 (r314666)
+++ stable/10/sys/netinet/in_pcb.c Sat Mar 4 13:03:31 2017 (r314667)
@@ -2139,7 +2139,7 @@ ipport_tick_init(const void *unused __un
{
/* 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);
Modified: stable/10/sys/netinet/ip_mroute.c
==============================================================================
--- stable/10/sys/netinet/ip_mroute.c Sat Mar 4 12:51:57 2017 (r314666)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-stable
mailing list