Merge remote-tracking branch 'tip/timers/core' into afs-next

These AFS patches need the timer_reduce() patch from timers/core.

Signed-off-by: David Howells <dhowells@redhat.com>

1 files changed, 12 insertions, 17 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index a2dccfe1acec..3b67c0a0df16 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1493,9 +1493,9 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq,
 }
 EXPORT_SYMBOL(queue_work_on);
 
-void delayed_work_timer_fn(unsigned long __data)
+void delayed_work_timer_fn(struct timer_list *t)
 {
-        struct delayed_work *dwork = (struct delayed_work *)__data;
+        struct delayed_work *dwork = from_timer(dwork, t, timer);
 
         /* should have been called from irqsafe timer with irq already off */
         __queue_work(dwork->cpu, dwork->wq, &dwork->work);
@@ -1509,8 +1509,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
         struct work_struct *work = &dwork->work;
 
         WARN_ON_ONCE(!wq);
-        WARN_ON_ONCE(timer->function != delayed_work_timer_fn ||
-                     timer->data != (unsigned long)dwork);
+        WARN_ON_ONCE(timer->function != (TIMER_FUNC_TYPE)delayed_work_timer_fn);
         WARN_ON_ONCE(timer_pending(timer));
         WARN_ON_ONCE(!list_empty(&work->entry));
 
@@ -1833,9 +1832,9 @@ static void destroy_worker(struct worker *worker)
         wake_up_process(worker->task);
 }
 
-static void idle_worker_timeout(unsigned long __pool)
+static void idle_worker_timeout(struct timer_list *t)
 {
-        struct worker_pool *pool = (void *)__pool;
+        struct worker_pool *pool = from_timer(pool, t, idle_timer);
 
         spin_lock_irq(&pool->lock);
 
@@ -1881,9 +1880,9 @@ static void send_mayday(struct work_struct *work)
         }
 }
 
-static void pool_mayday_timeout(unsigned long __pool)
+static void pool_mayday_timeout(struct timer_list *t)
 {
-        struct worker_pool *pool = (void *)__pool;
+        struct worker_pool *pool = from_timer(pool, t, mayday_timer);
         struct work_struct *work;
 
         spin_lock_irq(&pool->lock);
@@ -3236,11 +3235,9 @@ static int init_worker_pool(struct worker_pool *pool)
         INIT_LIST_HEAD(&pool->idle_list);
         hash_init(pool->busy_hash);
 
-        setup_deferrable_timer(&pool->idle_timer, idle_worker_timeout,
-                               (unsigned long)pool);
+        timer_setup(&pool->idle_timer, idle_worker_timeout, TIMER_DEFERRABLE);
 
-        setup_timer(&pool->mayday_timer, pool_mayday_timeout,
-                    (unsigned long)pool);
+        timer_setup(&pool->mayday_timer, pool_mayday_timeout, 0);
 
         mutex_init(&pool->attach_mutex);
         INIT_LIST_HEAD(&pool->workers);
@@ -5383,11 +5380,8 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq)	{ }
  */
 #ifdef CONFIG_WQ_WATCHDOG
 
-static void wq_watchdog_timer_fn(unsigned long data);
-
 static unsigned long wq_watchdog_thresh = 30;
-static struct timer_list wq_watchdog_timer =
-        TIMER_DEFERRED_INITIALIZER(wq_watchdog_timer_fn, 0, 0);
+static struct timer_list wq_watchdog_timer;
 
 static unsigned long wq_watchdog_touched = INITIAL_JIFFIES;
 static DEFINE_PER_CPU(unsigned long, wq_watchdog_touched_cpu) = INITIAL_JIFFIES;
@@ -5401,7 +5395,7 @@ static void wq_watchdog_reset_touched(void)
                 per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies;
 }
 
-static void wq_watchdog_timer_fn(unsigned long data)
+static void wq_watchdog_timer_fn(struct timer_list *unused)
 {
         unsigned long thresh = READ_ONCE(wq_watchdog_thresh) * HZ;
         bool lockup_detected = false;
@@ -5503,6 +5497,7 @@ module_param_cb(watchdog_thresh, &wq_watchdog_thresh_ops, &wq_watchdog_thresh,
 
 static void wq_watchdog_init(void)
 {
+        timer_setup(&wq_watchdog_timer, wq_watchdog_timer_fn, TIMER_DEFERRABLE);
         wq_watchdog_set_thresh(wq_watchdog_thresh);
 }