diff --git a/[refs] b/[refs] index e09bbafd2c26..2af244935875 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1e453d2799760ecf2e09ecd45b80edbe7ff540e +refs/heads/master: d313dd85ad846bc768d58e9ceb28588f917f4c9a diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index 0c485a538099..2eb9fbddf5c6 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -1832,10 +1832,10 @@ static int worker_thread(void *__worker) } while (keep_working(gcwq)); worker_set_flags(worker, WORKER_PREP, false); - +sleep: if (unlikely(need_to_manage_workers(gcwq)) && manage_workers(worker)) goto recheck; -sleep: + /* * gcwq->lock is held and there's no work to process and no * need to manage, sleep. Workers are woken up only while