diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-05-17 01:38:57 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-05-17 02:36:19 -0400 |
| commit | ff86d4722124c300c40b85b6eb8ef2d410ab303c (patch) | |
| tree | 05e54b0bf6397ecbb5e7717a7925ac6ed2645a68 /include/linux/workqueue.h | |
| parent | 800408be11898f6d53ceecfd894cce8860fda26a (diff) | |
Update bcachefs sources to 0906b1fb49 bcachefs: fixes for 32 bit/big endian machines
Diffstat (limited to 'include/linux/workqueue.h')
| -rw-r--r-- | include/linux/workqueue.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 213562f2..1406c958 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -8,7 +8,7 @@ struct task_struct; struct workqueue_struct; struct work_struct; typedef void (*work_func_t)(struct work_struct *work); -void delayed_work_timer_fn(unsigned long __data); +void delayed_work_timer_fn(struct timer_list *); #define work_data_bits(work) ((unsigned long *)(&(work)->data)) @@ -44,9 +44,7 @@ struct delayed_work { #define INIT_DELAYED_WORK(_work, _func) \ do { \ INIT_WORK(&(_work)->work, (_func)); \ - __setup_timer(&(_work)->timer, delayed_work_timer_fn, \ - (unsigned long)(_work), \ - TIMER_IRQSAFE); \ + timer_setup(&(_work)->timer, delayed_work_timer_fn, 0); \ } while (0) static inline struct delayed_work *to_delayed_work(struct work_struct *work) |