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/contrib | |
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/contrib')
-rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 4 | ||||
-rw-r--r-- | sys/contrib/vchiq/interface/compat/vchi_bsd.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c index 3bb46cf..93ea572 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c @@ -189,7 +189,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); @@ -235,7 +235,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; diff --git a/sys/contrib/vchiq/interface/compat/vchi_bsd.c b/sys/contrib/vchiq/interface/compat/vchi_bsd.c index 31170bc..3d939b1 100644 --- a/sys/contrib/vchiq/interface/compat/vchi_bsd.c +++ b/sys/contrib/vchiq/interface/compat/vchi_bsd.c @@ -80,7 +80,7 @@ void 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: |