diff options
| author | Julian Veit <Claymore1298@gmail.com> | 2021-04-17 08:39:31 +0200 |
|---|---|---|
| committer | Julian Veit <Claymore1298@gmail.com> | 2021-04-17 08:39:31 +0200 |
| commit | f080e3dbaa060bf3d59560611b628a25fab6df7b (patch) | |
| tree | 811ff5236a4568a3331e17fcfd873642aca0fbdb /kernel/workqueue.c | |
| parent | bc18b8fd8a1c97d87a8a6274a35afdfaa8d9f385 (diff) | |
| parent | edfe8b68de5392cc7b759f7723b6494422cb5359 (diff) | |
Merge branch 'linux-stable' into HEADr11.1-backup
Change-Id: I243aa151ea3e897496378bb24f94cb31d36d770d
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index b473a91c19ce..112b191d970c 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1407,7 +1407,6 @@ static void __queue_work(int cpu, struct workqueue_struct *wq, */ WARN_ON_ONCE(!irqs_disabled()); - debug_work_activate(work); /* if draining, only works from the same workqueue are allowed */ if (unlikely(wq->flags & __WQ_DRAINING) && @@ -1490,6 +1489,7 @@ retry: worklist = &pwq->delayed_works; } + debug_work_activate(work); insert_work(pwq, work, worklist, work_flags); spin_unlock(&pwq->pool->lock); |