diff options
| author | jlemon <jlemon@FreeBSD.org> | 2000-11-25 06:22:16 +0000 |
|---|---|---|
| committer | jlemon <jlemon@FreeBSD.org> | 2000-11-25 06:22:16 +0000 |
| commit | 7f57729d27eabceea7b2d1da8e4daa1aff81d4b1 (patch) | |
| tree | cc6169b9cadd74990e10fb85cf75f28ebdc92693 /sys/sys/callout.h | |
| parent | 534ec06045a1b2160fd3a756ac756a510819841d (diff) | |
| download | FreeBSD-src-7f57729d27eabceea7b2d1da8e4daa1aff81d4b1.zip FreeBSD-src-7f57729d27eabceea7b2d1da8e4daa1aff81d4b1.tar.gz | |
Revert the last commit to the callout interface, and add a flag to
callout_init() indicating whether the callout is safe or not. Update
the callers of callout_init() to reflect the new interface.
Okayed by: Jake
Diffstat (limited to 'sys/sys/callout.h')
| -rw-r--r-- | sys/sys/callout.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/sys/callout.h b/sys/sys/callout.h index a46055e..9eecb44 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -77,18 +77,11 @@ extern struct mtx callout_lock; #define callout_active(c) ((c)->c_flags & CALLOUT_ACTIVE) #define callout_deactivate(c) ((c)->c_flags &= ~CALLOUT_ACTIVE) -void callout_init __P((struct callout *)); +void callout_init __P((struct callout *, int)); #define callout_pending(c) ((c)->c_flags & CALLOUT_PENDING) -void _callout_reset __P((struct callout *, int, void (*)(void *), void *, - int)); +void callout_reset __P((struct callout *, int, void (*)(void *), void *)); void callout_stop __P((struct callout *)); -#define callout_reset(c, ticks, func, arg) \ - _callout_reset((c), (ticks), (func), (arg), 0) - -#define mp_callout_reset(c, ticks, func, arg) \ - _callout_reset((c), (ticks), (func), (arg), CALLOUT_MPSAFE) - #endif #endif /* _SYS_CALLOUT_H_ */ |
