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

Pull workqueue updates from Tejun Heo:
 "Nothing major. I introduced a flag collsion bug during v4.13 cycle
  which is fixed in this pull request. Fortunately, the flag is for
  debugging / verification and the bug isn't critical"

* 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Fix flag collision
  workqueue: Use TASK_IDLE
  workqueue: fix path to documentation
  workqueue: doc change for ST behavior on NUMA systems

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index ab3c0dc8c7ed..64d0edf428f8 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -21,7 +21,7 @@
  * pools for workqueues which are not bound to any specific CPU - the
  * number of these backing pools is dynamic.
  *
- * Please read Documentation/workqueue.txt for details.
+ * Please read Documentation/core-api/workqueue.rst for details.
  */
 
 #include <linux/export.h>
@@ -2269,7 +2269,7 @@ sleep:
          * event.
          */
         worker_enter_idle(worker);
-        __set_current_state(TASK_INTERRUPTIBLE);
+        __set_current_state(TASK_IDLE);
         spin_unlock_irq(&pool->lock);
         schedule();
         goto woke_up;
@@ -2311,7 +2311,7 @@ static int rescuer_thread(void *__rescuer)
          */
         rescuer->task->flags |= PF_WQ_WORKER;
 repeat:
-        set_current_state(TASK_INTERRUPTIBLE);
+        set_current_state(TASK_IDLE);
 
         /*
          * By the time the rescuer is requested to stop, the workqueue