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/ofed | |
| 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/ofed')
| -rw-r--r-- | sys/ofed/include/linux/timer.h | 4 | ||||
| -rw-r--r-- | sys/ofed/include/linux/workqueue.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/ofed/include/linux/timer.h b/sys/ofed/include/linux/timer.h index 0bb85b4..53ee20b 100644 --- a/sys/ofed/include/linux/timer.h +++ b/sys/ofed/include/linux/timer.h @@ -48,14 +48,14 @@ extern unsigned long linux_timer_hz_mask; do { \ (timer)->function = (func); \ (timer)->data = (dat); \ - callout_init(&(timer)->timer_callout, CALLOUT_MPSAFE); \ + callout_init(&(timer)->timer_callout, 1); \ } while (0) #define init_timer(timer) \ do { \ (timer)->function = NULL; \ (timer)->data = 0; \ - callout_init(&(timer)->timer_callout, CALLOUT_MPSAFE); \ + callout_init(&(timer)->timer_callout, 1); \ } while (0) extern void mod_timer(struct timer_list *, unsigned long); diff --git a/sys/ofed/include/linux/workqueue.h b/sys/ofed/include/linux/workqueue.h index 38cd2fe..075016a 100644 --- a/sys/ofed/include/linux/workqueue.h +++ b/sys/ofed/include/linux/workqueue.h @@ -78,7 +78,7 @@ do { \ #define INIT_DELAYED_WORK(_work, func) \ do { \ INIT_WORK(&(_work)->work, func); \ - callout_init(&(_work)->timer, CALLOUT_MPSAFE); \ + callout_init(&(_work)->timer, 1); \ } while (0) #define INIT_DEFERRABLE_WORK INIT_DELAYED_WORK |
