diff options
| -rw-r--r-- | UPDATING | 5 | ||||
| -rw-r--r-- | sys/kern/kern_timeout.c | 10 | ||||
| -rw-r--r-- | sys/sys/callout.h | 3 |
3 files changed, 6 insertions, 12 deletions
@@ -17,6 +17,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 5.x IS SLOW: developers choose to disable these features on build machines to maximize performance. +20040420: + Due to changes in the callout ABI, kernels compiled after this + date may be incompatible with kernel modules compiled prior to + 20040406. + 20040414: The PCI bus power state stuff has been turned on. If this causes problems for your system, please disable it using the tunable 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 |
