diff options
| author | jkim <jkim@FreeBSD.org> | 2015-05-22 17:05:21 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-05-22 17:05:21 +0000 |
| commit | 318c4f97e694c1972b55450cafe914f39977d179 (patch) | |
| tree | 9c598a67317c5e22e5e44d49e8bb797cb28e79b9 /sys/mips | |
| parent | b15207d5c210e55bafbc6c85235ab64d12815e79 (diff) | |
| download | FreeBSD-src-318c4f97e694c1972b55450cafe914f39977d179.zip FreeBSD-src-318c4f97e694c1972b55450cafe914f39977d179.tar.gz | |
CALLOUT_MPSAFE has lost its meaning since r141428, i.e., for more than ten
years for head. However, it is continuously misused as the mpsafe argument
for callout_init(9). Deprecate the flag and clean up callout_init() calls
to make them more consistent.
Differential Revision: https://reviews.freebsd.org/D2613
Reviewed by: jhb
MFC after: 2 weeks
Diffstat (limited to 'sys/mips')
| -rw-r--r-- | sys/mips/cavium/octe/ethernet.c | 2 | ||||
| -rw-r--r-- | sys/mips/cavium/octeon_rnd.c | 2 | ||||
| -rw-r--r-- | sys/mips/nlm/dev/net/xlpge.c | 2 | ||||
| -rw-r--r-- | sys/mips/rmi/dev/xlr/rge.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sys/mips/cavium/octe/ethernet.c b/sys/mips/cavium/octe/ethernet.c index b2a5ddf..d473d82 100644 --- a/sys/mips/cavium/octe/ethernet.c +++ b/sys/mips/cavium/octe/ethernet.c @@ -455,7 +455,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; diff --git a/sys/mips/cavium/octeon_rnd.c b/sys/mips/cavium/octeon_rnd.c index 9419314..844de45 100644 --- a/sys/mips/cavium/octeon_rnd.c +++ b/sys/mips/cavium/octeon_rnd.c @@ -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(); diff --git a/sys/mips/nlm/dev/net/xlpge.c b/sys/mips/nlm/dev/net/xlpge.c index e9bb86e..aaa6379 100644 --- a/sys/mips/nlm/dev/net/xlpge.c +++ b/sys/mips/nlm/dev/net/xlpge.c @@ -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)); diff --git a/sys/mips/rmi/dev/xlr/rge.c b/sys/mips/rmi/dev/xlr/rge.c index 6fd2bc6..248dd42 100644 --- a/sys/mips/rmi/dev/xlr/rge.c +++ b/sys/mips/rmi/dev/xlr/rge.c @@ -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) { |
