[PATCH] fix busted pr_info conversion in kernel/workqueue.c

[Valdis Kletnieks]

commit 2d916033a318d7e763eb099c69600d5dcd1ccb6b
Author: Fabian Frederick <fabf@xxxxxxxxx>
Date:   Mon May 12 13:59:35 2014 -0400

    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@xxxxxx>

--- linux-next/kernel/workqueue.c.dist	2014-05-26 11:18:40.155380772 -0400
+++ linux-next/kernel/workqueue.c	2014-05-27 12:07:51.464678172 -0400
@@ -4440,7 +4440,7 @@ void print_worker_info(const char *log_l
 		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");

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/