From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH RT 09/10] rtmutex: Have slowfn of rt_mutex_timed_fastlock() use enum
Date: Fri, 26 Feb 2016 16:41:09 -0500 [thread overview]
Message-ID: <20160226214120.498049504@goodmis.org> (raw)
In-Reply-To: 20160226214100.390136141@goodmis.org
[-- Attachment #1: 0009-rtmutex-Have-slowfn-of-rt_mutex_timed_fastlock-use-e.patch --]
[-- Type: text/plain, Size: 1058 bytes --]
3.10.97-rt106-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
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 <rostedt@goodmis.org>
---
kernel/rtmutex.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index 8c29e48afa3a..a809539f443c 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -1636,7 +1636,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
next prev parent reply other threads:[~2016-02-26 21:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 21:41 [PATCH RT 00/10] Linux 3.10.97-rt106-rc1 Steven Rostedt
2016-02-26 21:41 ` [PATCH RT 01/10] ARM: smp: Move clear_tasks_mm_cpumask() call to __cpu_die() Steven Rostedt
2016-02-26 21:41 ` [PATCH RT 02/10] rtmutex: Handle non enqueued waiters gracefully Steven Rostedt
2016-02-26 21:41 ` [PATCH RT 03/10] rtmutex: Use chainwalking control enum Steven Rostedt
2016-02-26 21:41 ` [PATCH RT 04/10] dump stack: dont disable preemption during trace Steven Rostedt
2016-02-26 21:41 ` [PATCH RT 05/10] net: Make synchronize_rcu_expedited() conditional on !RT_FULL Steven Rostedt
2016-02-26 21:41 ` [PATCH RT 06/10] net/core/cpuhotplug: Drain input_pkt_queue lockless Steven Rostedt
2016-02-26 21:41 ` [PATCH RT 07/10] irqwork: Move irq safe work to irq context Steven Rostedt
2016-02-26 21:41 ` [PATCH RT 08/10] sched: Introduce the trace_sched_waking tracepoint Steven Rostedt
2016-02-26 21:41 ` Steven Rostedt [this message]
2016-02-26 21:41 ` [PATCH RT 10/10] Linux 3.10.97-rt106-rc1 Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160226214120.498049504@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=bigeasy@linutronix.de \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).