From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755398AbcBZVdx (ORCPT ); Fri, 26 Feb 2016 16:33:53 -0500 Received: from mail.kernel.org ([198.145.29.136]:48233 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755160AbcBZVdq (ORCPT ); Fri, 26 Feb 2016 16:33:46 -0500 Message-Id: <20160226213340.950256618@goodmis.org> User-Agent: quilt/0.61-1 Date: Fri, 26 Feb 2016 16:32:41 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-rt-users Cc: Thomas Gleixner , Carsten Emde , Sebastian Andrzej Siewior , John Kacur , Paul Gortmaker , Brad Mouring Subject: [PATCH RT 06/12] rtmutex: Use chainwalking control enum References: <20160226213235.253312067@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0006-rtmutex-Use-chainwalking-control-enum.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18.27-rt26-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: "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 Signed-off-by: Brad Mouring Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Steven Rostedt --- 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 c1b7d5b1be7e..8d950b4521fc 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1008,7 +1008,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