On Mon, Sep 14, 2020 at 10:42:13PM +0200, Thomas Gleixner wrote:

CONFIG_PREEMPT_COUNT is now unconditionally enabled and will be removed. Cleanup the leftovers before doing so.

Signed-off-by: Thomas Gleixner tglx@linutronix.de Cc: Peter Zijlstra peterz@infradead.org Cc: Ingo Molnar mingo@kernel.org Cc: Will Deacon will@kernel.org

---

include/linux/lockdep.h | 6 ++---- lib/Kconfig.debug | 1 - 2 files changed, 2 insertions(+), 5 deletions(-)

--- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -585,16 +585,14 @@ do { \ #define lockdep_assert_preemption_enabled() \ do { \

• WARN_ON_ONCE(IS_ENABLED(CONFIG_PREEMPT_COUNT) && \

•      debug_locks			&&		\
  

• WARN_ON_ONCE(debug_locks && \ (preempt_count() != 0 || \ !raw_cpu_read(hardirqs_enabled))); \

} while (0) #define lockdep_assert_preemption_disabled() \ do { \

• WARN_ON_ONCE(IS_ENABLED(CONFIG_PREEMPT_COUNT) && \

•      debug_locks			&&		\
  

• WARN_ON_ONCE(debug_locks && \ (preempt_count() == 0 && \ raw_cpu_read(hardirqs_enabled))); \

} while (0) --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1161,7 +1161,6 @@ config PROVE_LOCKING select DEBUG_RWSEMS select DEBUG_WW_MUTEX_SLOWPATH select DEBUG_LOCK_ALLOC

• select PREEMPT_COUNT select TRACE_IRQFLAGS default n help

Acked-by: Will Deacon will@kernel.org

Will