aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/locking/rtmutex-debug.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-04-23 05:12:44 -0400
committerIngo Molnar <mingo@kernel.org>2017-04-23 05:12:44 -0400
commit58d30c36d472b75e8e9962d6a640be19d9389128 (patch)
treece161b15e844d081f527f02a4f74ffd1171b2b14 /kernel/locking/rtmutex-debug.c
parent94836ecf1e7378b64d37624fbb81fe48fbd4c772 (diff)
parentf2094107ac82bf867184efd77cee30b6a98e2e20 (diff)
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney: - Documentation updates. - Miscellaneous fixes. - Parallelize SRCU callback handling (plus overlapping patches). Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking/rtmutex-debug.c')
-rw-r--r--kernel/locking/rtmutex-debug.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c
index 97ee9df32e0f..db4f55211b04 100644
--- a/kernel/locking/rtmutex-debug.c
+++ b/kernel/locking/rtmutex-debug.c
@@ -102,10 +102,11 @@ void debug_rt_mutex_print_deadlock(struct rt_mutex_waiter *waiter)
102 return; 102 return;
103 } 103 }
104 104
105 printk("\n============================================\n"); 105 pr_warn("\n");
106 printk( "[ BUG: circular locking deadlock detected! ]\n"); 106 pr_warn("============================================\n");
107 printk("%s\n", print_tainted()); 107 pr_warn("WARNING: circular locking deadlock detected!\n");
108 printk( "--------------------------------------------\n"); 108 pr_warn("%s\n", print_tainted());
109 pr_warn("--------------------------------------------\n");
109 printk("%s/%d is deadlocking current task %s/%d\n\n", 110 printk("%s/%d is deadlocking current task %s/%d\n\n",
110 task->comm, task_pid_nr(task), 111 task->comm, task_pid_nr(task),
111 current->comm, task_pid_nr(current)); 112 current->comm, task_pid_nr(current));