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

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

Fabian Frederick committed 12 years ago

Commit 2d916031 parent 534a3fb1 file · +3 −3Browse files

Showing the changes to kernel/workqueue.c (1 of 1 file). Show all

Unified · Split

kernel/workqueue.c+3−3

@@ -4117,8 +4117,8 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu, · 4116 unmodified lines
4117	/* create a new pwq */	4117	/* create a new pwq */
4118	pwq = alloc_unbound_pwq(wq, target_attrs);	4118	pwq = alloc_unbound_pwq(wq, target_attrs);
4119	if (!pwq) {	4119	if (!pwq) {
4120	pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n",	4120	pr_warn("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n",
4121	wq->name);	4121	wq->name);
4122	mutex_lock(&wq->mutex);	4122	mutex_lock(&wq->mutex);
4123	goto use_dfl_pwq;	4123	goto use_dfl_pwq;
4124	}	4124	}
@@ -4568,7 +4568,7 @@ void print_worker_info(const char log_lvl, struct task_struct task) · 443 unmodified lines
4568	probe_kernel_read(desc, worker->desc, sizeof(desc) - 1);	4568	probe_kernel_read(desc, worker->desc, sizeof(desc) - 1);
4569		4569
4570	if (fn \|\| name[0] \|\| desc[0]) {	4570	if (fn \|\| name[0] \|\| desc[0]) {
4571	printk("%sWorkqueue: %s %pf", log_lvl, name, fn);	4571	pr_info("%sWorkqueue: %s %pf", log_lvl, name, fn);
4572	if (desc[0])	4572	if (desc[0])
4573	pr_cont(" (%s)", desc);	4573	pr_cont(" (%s)", desc);
4574	pr_cont("\n");	4574	pr_cont("\n");