1 files changed, 6 insertions, 6 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 7abbeed13421..8ea9e4fb8cc6 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2277,7 +2277,7 @@ __acquires(&pool->lock)
 
         if (unlikely(in_atomic() || lockdep_depth(current) > 0)) {
                 pr_err("BUG: workqueue leaked lock or atomic: %s/0x%08x/%d\n"
-                       "     last function: %pf\n",
+                       "     last function: %ps\n",
                        current->comm, preempt_count(), task_pid_nr(current),
                        worker->current_func);
                 debug_show_held_locks(current);
@@ -2596,11 +2596,11 @@ static void check_flush_dependency(struct workqueue_struct *target_wq,
         worker = current_wq_worker();
 
         WARN_ONCE(current->flags & PF_MEMALLOC,
-                  "workqueue: PF_MEMALLOC task %d(%s) is flushing !WQ_MEM_RECLAIM %s:%pf",
+                  "workqueue: PF_MEMALLOC task %d(%s) is flushing !WQ_MEM_RECLAIM %s:%ps",
                   current->pid, current->comm, target_wq->name, target_func);
         WARN_ONCE(worker && ((worker->current_pwq->wq->flags &
                               (WQ_MEM_RECLAIM | __WQ_LEGACY)) == WQ_MEM_RECLAIM),
-                  "workqueue: WQ_MEM_RECLAIM %s:%pf is flushing !WQ_MEM_RECLAIM %s:%pf",
+                  "workqueue: WQ_MEM_RECLAIM %s:%ps is flushing !WQ_MEM_RECLAIM %s:%ps",
                   worker->current_pwq->wq->name, worker->current_func,
                   target_wq->name, target_func);
 }
@@ -4582,7 +4582,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);
+                printk("%sWorkqueue: %s %ps", log_lvl, name, fn);
                 if (strcmp(name, desc))
                         pr_cont(" (%s)", desc);
                 pr_cont("\n");
@@ -4607,7 +4607,7 @@ static void pr_cont_work(bool comma, struct work_struct *work)
                 pr_cont("%s BAR(%d)", comma ? "," : "",
                         task_pid_nr(barr->task));
         } else {
-                pr_cont("%s %pf", comma ? "," : "", work->func);
+                pr_cont("%s %ps", comma ? "," : "", work->func);
         }
 }
 
@@ -4639,7 +4639,7 @@ static void show_pwq(struct pool_workqueue *pwq)
                         if (worker->current_pwq != pwq)
                                 continue;
 
-                        pr_cont("%s %d%s:%pf", comma ? "," : "",
+                        pr_cont("%s %d%s:%ps", comma ? "," : "",
                                 task_pid_nr(worker->task),
                                 worker == pwq->wq->rescuer ? "(RESCUER)" : "",
                                 worker->current_func);