The following commit has been merged into the locking/urgent branch of tip:

Commit-ID: 07d25971b220e477eb019fcb520a9f2e3ac966af Gitweb: https://git.kernel.org/tip/07d25971b220e477eb019fcb520a9f2e3ac966af Author: Zhen Lei thunder.leizhen@huawei.com AuthorDate: Sat, 31 Jul 2021 20:30:11 +08:00 Committer: Thomas Gleixner tglx@linutronix.de CommitterDate: Tue, 10 Aug 2021 08:21:52 +02:00

locking/rtmutex: Use the correct rtmutex debugging config option

It's CONFIG_DEBUG_RT_MUTEXES not CONFIG_DEBUG_RT_MUTEX.

Fixes: f7efc4799f81 ("locking/rtmutex: Inline chainwalk depth check") Signed-off-by: Zhen Lei thunder.leizhen@huawei.com Signed-off-by: Thomas Gleixner tglx@linutronix.de Acked-by: Will Deacon will@kernel.org Acked-by: Boqun Feng boqun.feng@gmail.com Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210731123011.4555-1-thunder.leizhen@huawei.com

--- kernel/locking/rtmutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index b5d9bb5..ad0db32 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -343,7 +343,7 @@ static __always_inline bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter, enum rtmutex_chainwalk chwalk) { - if (IS_ENABLED(CONFIG_DEBUG_RT_MUTEX)) + if (IS_ENABLED(CONFIG_DEBUG_RT_MUTEXES)) return waiter != NULL; return chwalk == RT_MUTEX_FULL_CHAINWALK; }