Commit ad1490bc authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue update from Tejun Heo:
 "One trivial patch to use setup_deferrable_timer() instead of
  open-coding the initialization"

* 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: use setup_deferrable_timer
parents e69bbe75 c30fb26b
...@@ -3209,9 +3209,8 @@ static int init_worker_pool(struct worker_pool *pool) ...@@ -3209,9 +3209,8 @@ static int init_worker_pool(struct worker_pool *pool)
INIT_LIST_HEAD(&pool->idle_list); INIT_LIST_HEAD(&pool->idle_list);
hash_init(pool->busy_hash); hash_init(pool->busy_hash);
init_timer_deferrable(&pool->idle_timer); setup_deferrable_timer(&pool->idle_timer, idle_worker_timeout,
pool->idle_timer.function = idle_worker_timeout; (unsigned long)pool);
pool->idle_timer.data = (unsigned long)pool;
setup_timer(&pool->mayday_timer, pool_mayday_timeout, setup_timer(&pool->mayday_timer, pool_mayday_timeout,
(unsigned long)pool); (unsigned long)pool);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment