diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-22 17:05:21 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-22 17:05:21 +0000 |
| commit | fd90e2ed54a69bb07d14dcd4e805431ccb7d6cb6 (patch) | |
| tree | 9c598a67317c5e22e5e44d49e8bb797cb28e79b9 /sys/dev/ce | |
| parent | 316f4c880a15660086e5c9e7ee31f8b717e855f1 (diff) | |
Notes
Diffstat (limited to 'sys/dev/ce')
| -rw-r--r-- | sys/dev/ce/if_ce.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c index 7d81720a69a18..8ef3e1ef38849 100644 --- a/sys/dev/ce/if_ce.c +++ b/sys/dev/ce/if_ce.c @@ -104,10 +104,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; \ @@ -609,7 +605,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 @@ -661,7 +657,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); @@ -2558,7 +2554,7 @@ static int ce_modevent (module_t mod, int type, void *unused) 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 |