tj: Refreshed on top of wq/for-3.16.
Showing the changes to kernel/workqueue.c (1 of 1 file). Show all
Unified · Split
| @@ -4117,8 +4117,8 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu, · 4116 unmodified lines | ||
| 4117 | 4117 | /* create a new pwq */ |
| 4118 | 4118 | pwq = alloc_unbound_pwq(wq, target_attrs); |
| 4119 | 4119 | if (!pwq) { |
| 4120 | − pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n", | |
| 4121 | − wq->name); | |
| 4120 | + pr_warn("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n", | |
| 4121 | + wq->name); | |
| 4122 | 4122 | mutex_lock(&wq->mutex); |
| 4123 | 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 | 4568 | probe_kernel_read(desc, worker->desc, sizeof(desc) - 1); |
| 4569 | 4569 | |
| 4570 | 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 | 4572 | if (desc[0]) |
| 4573 | 4573 | pr_cont(" (%s)", desc); |
| 4574 | 4574 | pr_cont("\n"); |