The following commit has been merged into the locking/core branch of tip: Commit-ID: f7efc4799f8114ba85b68584f83293f435009de4 Gitweb: https://git.kernel.org/tip/f7efc4799f8114ba85b68584f83293f435009de4 Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Fri, 26 Mar 2021 16:29:36 +01:00 Committer: Ingo Molnar <mi...@kernel.org> CommitterDate: Mon, 29 Mar 2021 15:57:03 +02:00
locking/rtmutex: Inline chainwalk depth check There is no point for this wrapper at all. Signed-off-by: Thomas Gleixner <t...@linutronix.de> Signed-off-by: Ingo Molnar <mi...@kernel.org> Acked-by: Peter Zijlstra (Intel) <pet...@infradead.org> Link: https://lore.kernel.org/r/20210326153943.754254...@linutronix.de --- kernel/locking/rtmutex.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 8a934db..2c77e72 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -343,14 +343,9 @@ static void rt_mutex_adjust_prio(struct task_struct *p) static bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter, enum rtmutex_chainwalk chwalk) { - /* - * This is just a wrapper function for the following call, - * because debug_rt_mutex_detect_deadlock() smells like a magic - * debug feature and I wanted to keep the cond function in the - * main source file along with the comments instead of having - * two of the same in the headers. - */ - return debug_rt_mutex_detect_deadlock(waiter, chwalk); + if (IS_ENABLED(CONFIG_DEBUG_RT_MUTEX)) + return waiter != NULL; + return chwalk == RT_MUTEX_FULL_CHAINWALK; } /*
