diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 16:01:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-09-03 16:01:36 -0700 |
| commit | 516d5f8b04ce2bcd24f03323fc743ae25b81373d (patch) | |
| tree | ff37e84692dbef5063bbf22672eb8bfad0f25dd8 /kernel/locking/rtmutex-debug.c | |
| parent | 6ba694560caeb3531dbedd5b3a37af037ef2a833 (diff) | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
Merge tag 'v3.17-rc3' into next
Sync with mainline to bring in Chrome EC changes.
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 49b2ed3dced..62b6cee8ea7 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); |