Commit 839da253 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locking_urgent_for_v5.14_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fix from Borislav Petkov:

 - Fix a CONFIG symbol's spelling

* tag 'locking_urgent_for_v5.14_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/rtmutex: Use the correct rtmutex debugging config option
parents 12aef8ac 07d25971

kernel/locking/rtmutex.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}