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: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Tejun Heo <tj@kernel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index c3f076f0f8fd..c8411085466f 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4117,8 +4117,8 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
         /* create a new pwq */
         pwq = alloc_unbound_pwq(wq, target_attrs);
         if (!pwq) {
-                pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n",
-                           wq->name);
+                pr_warn("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n",
+                        wq->name);
                 mutex_lock(&wq->mutex);
                 goto use_dfl_pwq;
         }
@@ -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);
 
         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])
                         pr_cont(" (%s)", desc);
                 pr_cont("\n");