Update bcachefs sources to 0906b1fb49 bcachefs: fixes for 32 bit/big endian machines

[bcachefs-tools-debian] / include / linux / workqueue.h

diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 4bad3d34901104704c29a11855230476352d5f68..1406c9582c859c2627653fae54a7d47bc22480d3 100644 (file)
--- 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)
@@ -106,8 +104,6 @@ extern struct workqueue_struct *system_highpri_wq;
 extern struct workqueue_struct *system_long_wq;
 extern struct workqueue_struct *system_unbound_wq;
 extern struct workqueue_struct *system_freezable_wq;
-extern struct workqueue_struct *system_power_efficient_wq;
-extern struct workqueue_struct *system_freezable_power_efficient_wq;
 
 extern struct workqueue_struct *
 alloc_workqueue(const char *fmt, unsigned int flags,