fix busted pr_info conversion in kernel/workqueue.c
PATCH 1/1 fix busted pr_info conversion in kernel/workqueue.c
(resend - first attempt ate the To: line)
commit 2d916033a318d7e763eb099c69600d5dcd1ccb6b
Author: Fabian Frederick <[email protected]> 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.
kernel/workqueue.c renamed from kernel/workqueue.c.dist +1 -1
@@ -4440,7 +4440,7 @@ void print_worker_info(const char *log_lprobe_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" );
Hello Valdis,
I thought Tejun directly reverted that patch (Joe Perches noticed
the level problem just after submit).Anyway, problem is solved now :)
Thanks,
Fabian
Quoted 31 lines · On Tue, 27 May 2014 14:28:59 -0400 Valdis Kletnieks <[email protected]>…
(resend - first attempt ate the To: line)
commit
2d916033a318d7e763eb099c69600d5dcd1ccb6bAuthor: Fabian Frederick <[email protected]> Date: Mon May 12 13:59:35 2014 -0400
kernel/workqueue.c: pr_warning/pr_warn & printk/pr_infoThis commit did an incorrect
printk->pr_infoconversion. If we were converting topr_info()we should lose thelog_levelparameter. The problem is that this is called (indirectly) byshow_regs_print_info(), which is called with variouslog_levels(from_INFOclear to_EMERG). So we leave it as aprintk()call so the desiredlog_levelis applied.Not a full revert, as the other half of the patch is correct.
Signed-off-by Valdis Kletnieks <[email protected]>kernel/workqueue.c renamed from kernel/workqueue.c.dist +1
-1@@ -4440,7 +4440,7 @@ void print_worker_info(const char *log_lprobe_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" );
Quoted 4 lines · Fabian Frederick
Hello Valdis,
I thought Tejun directly reverted that patch (Joe Perches noticed
the level problem just after submit).Anyway, problem is solved now :)
Tejun - can you see if that patch in fact got reverted? It made it into the linux-next 20140529 tree somehow. (Perhaps the revert is in a tree that didn't get pushed/pulled correctly?)
Tejun Heo
maintainerQuoted 9 lines · On Tue, May 27, 2014 at 04:27:09PM -0400, [email protected] wrote:
Quoted 4 lines · Fabian Frederick
Hello Valdis,
I thought Tejun directly reverted that patch (Joe Perches noticed
the level problem just after submit).Anyway, problem is solved now :)Tejun - can you see if that patch in fact got reverted? It made it into the linux-next 20140529 tree somehow. (Perhaps the revert is in a tree that didn't get pushed/pulled correctly?)
Hah, thought I did. Apparently didn't. Applying the patch.
Thanks.
Signature · 1 line
tejun