The following commit has been merged into the locking/core branch of tip: Commit-ID: f22f71322a18e90e127f2fc2c11cc2d5191bc4c6 Gitweb: https://git.kernel.org/tip/f22f71322a18e90e127f2fc2c11cc2d5191bc4c6 Author: Waiman Long <longman@xxxxxxxxxx> AuthorDate: Thu, 22 Feb 2024 10:05:40 -05:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Wed, 28 Feb 2024 13:08:38 +01:00 locking/rwsem: Make DEBUG_RWSEMS and PREEMPT_RT mutually exclusive The debugging code enabled by CONFIG_DEBUG_RWSEMS=y will only be compiled in when CONFIG_PREEMPT_RT isn't set. There is no point to allow CONFIG_DEBUG_RWSEMS to be set in a kernel configuration where CONFIG_PREEMPT_RT is also set. Make them mutually exclusive. Signed-off-by: Waiman Long <longman@xxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Reviewed-by: Boqun Feng <boqun.feng@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20240222150540.79981-5-longman@xxxxxxxxxx --- lib/Kconfig.debug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 975a07f..cb695bc 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1303,7 +1303,7 @@ config PROVE_LOCKING select DEBUG_SPINLOCK select DEBUG_MUTEXES if !PREEMPT_RT select DEBUG_RT_MUTEXES if RT_MUTEXES - select DEBUG_RWSEMS + select DEBUG_RWSEMS if !PREEMPT_RT select DEBUG_WW_MUTEX_SLOWPATH select DEBUG_LOCK_ALLOC select PREEMPT_COUNT if !ARCH_NO_PREEMPT @@ -1426,7 +1426,7 @@ config DEBUG_WW_MUTEX_SLOWPATH config DEBUG_RWSEMS bool "RW Semaphore debugging: basic checks" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && !PREEMPT_RT help This debugging feature allows mismatched rw semaphore locks and unlocks to be detected and reported.