From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423356AbcBZWUS (ORCPT ); Fri, 26 Feb 2016 17:20:18 -0500 Received: from mail.kernel.org ([198.145.29.136]:51786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755473AbcBZWUN (ORCPT ); Fri, 26 Feb 2016 17:20:13 -0500 Message-Id: <20160226214223.438003327@goodmis.org> User-Agent: quilt/0.61-1 Date: Fri, 26 Feb 2016 16:42:13 -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 Subject: [PATCH RT 6/7] rtmutex: Have slowfn of rt_mutex_timed_fastlock() use enum References: <20160226214207.654222592@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0006-rtmutex-Have-slowfn-of-rt_mutex_timed_fastlock-use-e.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.4.110-rt139-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: "Steven Rostedt (Red Hat)" The backport of commit 8930ed80f970 "rtmutex: Cleanup deadlock detector debug logic" had conflicts, and the conflict resolution changed rt_mutex_timed_fastlock()'s parameter to an enum, but missed changing its slowfn's prototype. Signed-off-by: Steven Rostedt --- kernel/rtmutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index fe0cc8f328c8..c2d0f9c8039f 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -1633,7 +1633,7 @@ rt_mutex_timed_fastlock(struct rt_mutex *lock, int state, enum rtmutex_chainwalk chwalk, int (*slowfn)(struct rt_mutex *lock, int state, struct hrtimer_sleeper *timeout, - int detect_deadlock)) + enum rtmutex_chainwalk chwalk)) { if (chwalk == RT_MUTEX_MIN_CHAINWALK && likely(rt_mutex_cmpxchg(lock, NULL, current))) { -- 2.7.0