diff options
| author | James Morris <[email protected]> | 2017-05-22 16:32:40 +1000 |
|---|---|---|
| committer | James Morris <[email protected]> | 2017-05-22 16:32:40 +1000 |
| commit | d68c51e0b377838dd31b37707813bb62089f399c (patch) | |
| tree | 4557d5ced33ea6da60bc84ee288af9924192f046 /kernel/locking/rtmutex-debug.c | |
| parent | 99c55fb18fc48508ae5bba57146a556aacc4558c (diff) | |
| parent | 08332893e37af6ae779367e78e444f8f9571511d (diff) | |
Sync to mainline for security submaintainers to work against
Diffstat (limited to 'kernel/locking/rtmutex-debug.c')
| -rw-r--r-- | kernel/locking/rtmutex-debug.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c index 97ee9df32e0f..58e366ad36f4 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) return; } - printk("\n============================================\n"); - printk( "[ BUG: circular locking deadlock detected! ]\n"); - printk("%s\n", print_tainted()); - printk( "--------------------------------------------\n"); + pr_warn("\n"); + pr_warn("============================================\n"); + pr_warn("WARNING: circular locking deadlock detected!\n"); + pr_warn("%s\n", print_tainted()); + pr_warn("--------------------------------------------\n"); printk("%s/%d is deadlocking current task %s/%d\n\n", task->comm, task_pid_nr(task), current->comm, task_pid_nr(current)); @@ -174,12 +175,3 @@ void debug_rt_mutex_init(struct rt_mutex *lock, const char *name) lock->name = name; } -void -rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task) -{ -} - -void rt_mutex_deadlock_account_unlock(struct task_struct *task) -{ -} - |