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

torvalds · torvalds · commit 839da2538529 · 2021-08-15T06:46:04.000-10:00
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
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ static __always_inline bool`
`343`	`343`	`rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter,`
`344`	`344`	`enum rtmutex_chainwalk chwalk)`
`345`	`345`	`{`
`346`		`- if (IS_ENABLED(CONFIG_DEBUG_RT_MUTEX))`
	`346`	`+ if (IS_ENABLED(CONFIG_DEBUG_RT_MUTEXES))`
`347`	`347`	`return waiter != NULL;`
`348`	`348`	`return chwalk == RT_MUTEX_FULL_CHAINWALK;`
`349`	`349`	`}`