From: Paul E. McKenney Date: Sat, 16 Mar 2024 06:29:59 +0000 (-0700) Subject: rcu: Remove redundant CONFIG_PROVE_RCU #if condition X-Git-Tag: v6.10-rc1~234^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10c9e40f297d3f1b0d4df6e73618d4466a0b2cfc;p=thirdparty%2Fkernel%2Flinux.git rcu: Remove redundant CONFIG_PROVE_RCU #if condition The #if condition controlling the rcu_preempt_sleep_check() definition has a redundant check for CONFIG_PREEMPT_RCU, which is already checked for by an enclosing #ifndef. This commit therefore removes this redundant condition from the inner #if. Signed-off-by: Paul E. McKenney Signed-off-by: Uladzislau Rezki (Sony) --- diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 2c54750e36a06..382780bb60f4e 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -401,15 +401,15 @@ static inline int debug_lockdep_rcu_enabled(void) } \ } while (0) -#if defined(CONFIG_PROVE_RCU) && !defined(CONFIG_PREEMPT_RCU) +#ifndef CONFIG_PREEMPT_RCU static inline void rcu_preempt_sleep_check(void) { RCU_LOCKDEP_WARN(lock_is_held(&rcu_lock_map), "Illegal context switch in RCU read-side critical section"); } -#else /* #ifdef CONFIG_PROVE_RCU */ +#else // #ifndef CONFIG_PREEMPT_RCU static inline void rcu_preempt_sleep_check(void) { } -#endif /* #else #ifdef CONFIG_PROVE_RCU */ +#endif // #else // #ifndef CONFIG_PREEMPT_RCU #define rcu_sleep_check() \ do { \