29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From: "bmouring@ni.com" <bmouring@ni.com>
|
|
Date: Tue, 15 Dec 2015 17:07:30 -0600
|
|
Subject: rtmutex: Use chainwalking control enum
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.6/older/patches-4.6.2-rt5.tar.xz
|
|
|
|
In 8930ed80 (rtmutex: Cleanup deadlock detector debug logic),
|
|
chainwalking control enums were introduced to limit the deadlock
|
|
detection logic. One of the calls to task_blocks_on_rt_mutex was
|
|
missed when converting to use the enums.
|
|
|
|
Cc: Thomas Gleixner <tglx@linutronix.de>
|
|
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/locking/rtmutex.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/kernel/locking/rtmutex.c
|
|
+++ b/kernel/locking/rtmutex.c
|
|
@@ -1017,7 +1017,7 @@ static void noinline __sched rt_spin_lo
|
|
__set_current_state_no_track(TASK_UNINTERRUPTIBLE);
|
|
raw_spin_unlock(&self->pi_lock);
|
|
|
|
- ret = task_blocks_on_rt_mutex(lock, &waiter, self, 0);
|
|
+ ret = task_blocks_on_rt_mutex(lock, &waiter, self, RT_MUTEX_MIN_CHAINWALK);
|
|
BUG_ON(ret);
|
|
|
|
for (;;) {
|