From: David Howells <dhowells@redhat.com>
Date: Mon, 13 Nov 2017 15:36:33 +0000 (+0000)
Subject: Merge remote-tracking branch 'tip/timers/core' into afs-next
X-Git-Tag: microblaze-4.16-rc1~330^2~35
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=81445e63e67a1e98b1c2575fa2b406d4289d2754;p=linux-2.6-microblaze.git

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>
---

81445e63e67a1e98b1c2575fa2b406d4289d2754
diff --cc kernel/workqueue.c
index a2dccfe1acec,6e5eed58f215..3b67c0a0df16
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@@ -3236,12 -3241,11 +3235,10 @@@ static int init_worker_pool(struct work
  	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->manager_arb);
  	mutex_init(&pool->attach_mutex);
  	INIT_LIST_HEAD(&pool->workers);