diff options
author | cperciva <cperciva@FreeBSD.org> | 2004-04-20 15:49:31 +0000 |
---|---|---|
committer | cperciva <cperciva@FreeBSD.org> | 2004-04-20 15:49:31 +0000 |
commit | 9e96265f37a3616b591223fdbb509c997392dcb8 (patch) | |
tree | 0dc44fef9bfc311c5a24ba000b367a36b95c6f8c /sys | |
parent | 7def13871eb50a9d1b5b197717c1e198c13e4b50 (diff) | |
download | FreeBSD-src-9e96265f37a3616b591223fdbb509c997392dcb8.zip FreeBSD-src-9e96265f37a3616b591223fdbb509c997392dcb8.tar.gz |
1. Remove callout_stop binary compatibility.
2. Document that this means that kernel modules must be rebuilt.
3. While I'm here, fix my sorting error in callout.h
Requested by: many [1], scottl [2], bde [3]
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/kern_timeout.c | 10 | ||||
-rw-r--r-- | sys/sys/callout.h | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 534797a..b1465ce 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -421,16 +421,6 @@ callout_reset(c, to_ticks, ftn, arg) mtx_unlock_spin(&callout_lock); } -/* For binary compatibility. */ -#undef callout_stop -int -callout_stop(c) - struct callout *c; -{ - - return(_callout_stop_safe(c, 0)); -} - int _callout_stop_safe(c, safe) struct callout *c; diff --git a/sys/sys/callout.h b/sys/sys/callout.h index e097596..50dedbf 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -73,12 +73,11 @@ extern struct mtx callout_lock; #define callout_active(c) ((c)->c_flags & CALLOUT_ACTIVE) #define callout_deactivate(c) ((c)->c_flags &= ~CALLOUT_ACTIVE) +#define callout_drain(c) _callout_stop_safe(c, 1) void callout_init(struct callout *, int); #define callout_pending(c) ((c)->c_flags & CALLOUT_PENDING) void callout_reset(struct callout *, int, void (*)(void *), void *); -int callout_stop(struct callout *); #define callout_stop(c) _callout_stop_safe(c, 0) -#define callout_drain(c) _callout_stop_safe(c, 1) int _callout_stop_safe(struct callout *, int); #endif |