aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-22 17:06:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-22 17:06:54 -0800
commitac9e806c9c018a6cc6e82d50275a4ac185343b4f (patch)
tree89a9ebb6f03ba4093f62947a2bb339785e5f783b /kernel
parent4b3bd22b123b7a75e2d08e4eb45d406b0fa685cd (diff)
parente9ad2eb3d9ae05471c9b9fafcc0a31d8f565ca5b (diff)
downloadlinux-ac9e806c9c018a6cc6e82d50275a4ac185343b4f.tar.gz
Merge branch 'for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull qorkqueue updates from Tejun Heo: "Tracepoint and comment updates only" * 'for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: Use %s instead of function name workqueue: tracing the name of the workqueue instead of it's address workqueue: fix annotation for WQ_SYSFS
Diffstat (limited to 'kernel')
-rw-r--r--kernel/workqueue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 894bb885b40b..0d150da252e8 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2964,8 +2964,8 @@ reflush:
if (++flush_cnt == 10 ||
(flush_cnt % 100 == 0 && flush_cnt <= 1000))
- pr_warn("workqueue %s: drain_workqueue() isn't complete after %u tries\n",
- wq->name, flush_cnt);
+ pr_warn("workqueue %s: %s() isn't complete after %u tries\n",
+ wq->name, __func__, flush_cnt);
mutex_unlock(&wq->mutex);
goto reflush;