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>

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index bc3c18892b7df4dd918b3439a5c572c7571180d6..90a0fa592b72d7883703f66bac1d9fbc1119f86a 100644 (file)
--- 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");