Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1344713

[PATCH RT 04/10] rtmutex: Use chainwalking control enum

Show all headers | View raw

3.14.61-rt63-rc1 stable review patch.
If anyone has any objections, please let me know.

------------------

From: "bmouring@ni.com" <bmouring@ni.com>

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>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 kernel/locking/rtmutex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 2f61c66d6f05..4bd9790dece5 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1251,7 +1251,7 @@ static void  noinline __sched rt_spin_lock_slowlock(struct rt_mutex *lock)
 	__set_current_state(TASK_UNINTERRUPTIBLE);
 	pi_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 (;;) {
-- 
2.7.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH RT 00/10] Linux 3.14.61-rt63-rc1 Steven Rostedt <rostedt@goodmis.org> - 2016-02-26 22:40 +0100
  [PATCH RT 04/10] rtmutex: Use chainwalking control enum Steven Rostedt <rostedt@goodmis.org> - 2016-02-26 22:40 +0100
  [PATCH RT 05/10] dump stack: dont disable preemption during trace Steven Rostedt <rostedt@goodmis.org> - 2016-02-26 22:40 +0100
  [PATCH RT 02/10] ARM: smp: Move clear_tasks_mm_cpumask() call to __cpu_die() Steven Rostedt <rostedt@goodmis.org> - 2016-02-26 22:50 +0100
  [PATCH RT 10/10] Linux 3.14.61-rt63-rc1 Steven Rostedt <rostedt@goodmis.org> - 2016-02-26 22:50 +0100
  [PATCH RT 08/10] irqwork: Move irq safe work to irq context Steven Rostedt <rostedt@goodmis.org> - 2016-02-26 23:40 +0100

csiph-web