locking/rtmutex: Inline chainwalk depth check
authorThomas Gleixner <tglx@linutronix.de>
Fri, 26 Mar 2021 15:29:36 +0000 (16:29 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 29 Mar 2021 13:57:03 +0000 (15:57 +0200)
There is no point for this wrapper at all.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210326153943.754254046@linutronix.de
kernel/locking/rtmutex.c

index 8a934db..2c77e72 100644 (file)
@@ -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;
 }
 
 /*