summaryrefslogtreecommitdiffstats
path: root/kernel/workqueue.c
diff options
context:
space:
mode:
authorValdis Kletnieks <Valdis.Kletnieks@vt.edu>2014-05-27 14:28:59 -0400
committerTejun Heo <tj@kernel.org>2014-05-28 10:22:34 -0400
commit015af06e103fa47af29ada0f564301c81d4973b2 (patch)
tree2f7c9e01e522659424f24a2c4a0c72b5179d284e /kernel/workqueue.c
parent74b414ead1133972817d3ce7b934356150d03a7d (diff)
downloadlinux-stable-015af06e103fa47af29ada0f564301c81d4973b2.tar.gz
linux-stable-015af06e103fa47af29ada0f564301c81d4973b2.tar.bz2
linux-stable-015af06e103fa47af29ada0f564301c81d4973b2.zip
kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info
This commit did an incorrect printk->pr_info conversion. If we were converting to pr_info() we should lose the log_level parameter. The problem is that this is called (indirectly) by show_regs_print_info(), which is called with various log_levels (from _INFO clear to _EMERG). So we leave it as a printk() call so the desired log_level is applied. Not a full revert, as the other half of the patch is correct. Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/workqueue.c')
-rw-r--r--kernel/workqueue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index bc3c18892b7d..90a0fa592b72 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4440,7 +4440,7 @@ void print_worker_info(const char *log_lvl, struct task_struct *task)
probe_kernel_read(desc, worker->desc, sizeof(desc) - 1);
if (fn || name[0] || desc[0]) {
- pr_info("%sWorkqueue: %s %pf", log_lvl, name, fn);
+ printk("%sWorkqueue: %s %pf", log_lvl, name, fn);
if (desc[0])
pr_cont(" (%s)", desc);
pr_cont("\n");