Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 015af06e authored by Valdis Kletnieks's avatar Valdis Kletnieks Committed by Tejun Heo
Browse files

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: default avatarValdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 74b414ea

kernel/workqueue.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

		probe_kernel_read(desc, worker->desc, sizeof(desc) - 1);





	if (fn || name[0] || desc[0]) {

	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])

		if (desc[0])

			pr_cont(" (%s)", desc);

			pr_cont(" (%s)", desc);

		pr_cont("\n");

		pr_cont("\n");