diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-03-24 14:24:16 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-24 14:24:16 +0100 |
| commit | 2c35669b82364f6e44cb5a21d45498646715d25a (patch) | |
| tree | ac7dbee40aa4332260ff3da2047f141766b42c7a /kernel/locking/rtmutex-debug.c | |
| parent | 82fc0deb5fb5067c5207ace309b4e3af3eeec17b (diff) | |
| parent | 68bb25c3df8a94edccb57e52c4d5f43a693817a4 (diff) | |
Merge tag 'v3.14.36-rt34-lno1' into linux-linaro-lsk-v3.14-rtlinux-linaro-lsk-v3.14-rt
Linux 3.14.36-rt34
Diffstat (limited to 'kernel/locking/rtmutex-debug.c')
| -rw-r--r-- | kernel/locking/rtmutex-debug.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c index 49b2ed3dced8..62b6cee8ea7f 100644 --- a/kernel/locking/rtmutex-debug.c +++ b/kernel/locking/rtmutex-debug.c @@ -66,12 +66,13 @@ void rt_mutex_debug_task_free(struct task_struct *task) * the deadlock. We print when we return. act_waiter can be NULL in * case of a remove waiter operation. */ -void debug_rt_mutex_deadlock(int detect, struct rt_mutex_waiter *act_waiter, +void debug_rt_mutex_deadlock(enum rtmutex_chainwalk chwalk, + struct rt_mutex_waiter *act_waiter, struct rt_mutex *lock) { struct task_struct *task; - if (!debug_locks || detect || !act_waiter) + if (!debug_locks || chwalk == RT_MUTEX_FULL_CHAINWALK || !act_waiter) return; task = rt_mutex_owner(act_waiter->lock); |