Commit 2d916033 authored by Fabian Frederick's avatar Fabian Frederick Committed by Tejun Heo

kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info

tj: Refreshed on top of wq/for-3.16.

Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 534a3fbb
...@@ -4117,8 +4117,8 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu, ...@@ -4117,8 +4117,8 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
/* create a new pwq */ /* create a new pwq */
pwq = alloc_unbound_pwq(wq, target_attrs); pwq = alloc_unbound_pwq(wq, target_attrs);
if (!pwq) { if (!pwq) {
pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n", pr_warn("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n",
wq->name); wq->name);
mutex_lock(&wq->mutex); mutex_lock(&wq->mutex);
goto use_dfl_pwq; goto use_dfl_pwq;
} }
...@@ -4568,7 +4568,7 @@ void print_worker_info(const char *log_lvl, struct task_struct *task) ...@@ -4568,7 +4568,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]) {
printk("%sWorkqueue: %s %pf", log_lvl, name, fn); pr_info("%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");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment