Messages in this thread Patch in this message | | | Date | Fri, 09 Oct 2020 17:01:27 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: core/rcu] lockdep: Cleanup PREEMPT_COUNT leftovers |
| |
The following commit has been merged into the core/rcu branch of tip:
Commit-ID: 0eb8743dc57063598478c2549669fda36c25b917 Gitweb: https://git.kernel.org/tip/0eb8743dc57063598478c2549669fda36c25b917 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Mon, 14 Sep 2020 19:23:55 +02:00 Committer: Paul E. McKenney <paulmck@kernel.org> CommitterDate: Mon, 28 Sep 2020 16:03:19 -07:00
lockdep: Cleanup PREEMPT_COUNT leftovers
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> Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Paul E. McKenney <paulmck@kernel.org> --- include/linux/lockdep.h | 6 ++---- lib/Kconfig.debug | 1 - 2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 6a584b3..879de69 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -560,16 +560,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) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index f50fbcf..d4d0574 100644 --- 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
| |