diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2016-02-26 10:03:48 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2016-06-24 16:33:04 -0400 |
| commit | 862b5fedeb36807d4dc15f500fb7ed23f338815f (patch) | |
| tree | 4924f9cb60b514252a8d576f687b84ca83940ac0 | |
| parent | 485a63ad516afc4ded80217511e29d956ce4f2de (diff) | |
| download | linux-rt-862b5fedeb36807d4dc15f500fb7ed23f338815f.tar.gz | |
rtmutex: Have slowfn of rt_mutex_timed_fastlock() use enum
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>
| -rw-r--r-- | kernel/rtmutex.c | 2 |
1 files changed, 1 insertions, 1 deletions
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))) { |