diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2020-09-16 11:45:26 -0700 |
|---|---|---|
| committer |   Paul E. McKenney <paulmck@kernel.org> | 2020-11-02 17:10:00 -0800 |
| commit | f505d4346f6129d4708338491cf23ca9cf1d8f2a (patch) | |
| tree | 0a0704e259ecb559859ffdcc28ce6abd326b805f /kernel/rcu | |
| parent | net: sched: Remove broken definitions and un-hide for !LOCKDEP (diff) | |
| download | linux-dev-f505d4346f6129d4708338491cf23ca9cf1d8f2a.tar.xz linux-dev-f505d4346f6129d4708338491cf23ca9cf1d8f2a.zip | |
srcu: Use a more appropriate lockdep helper
The lockdep_is_held() macro is defined as:
#define lockdep_is_held(lock) lock_is_held(&(lock)->dep_map)
This hides away the dereference, so that builds with !LOCKDEP don't break.
This works in current kernels because the RCU_LOCKDEP_WARN() eliminates
its condition at preprocessor time in !LOCKDEP kernels. However, later
patches in this series will cause the compiler to see this condition even
in !LOCKDEP kernels. This commit prepares for this upcoming change by
switching from lock_is_held() to lockdep_is_held().
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--
CC: jiangshanlai@gmail.com
CC: paulmck@kernel.org
CC: josh@joshtriplett.org
CC: rostedt@goodmis.org
CC: mathieu.desnoyers@efficios.com
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'kernel/rcu')
| -rw-r--r-- | kernel/rcu/srcutree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c index c13348ee80a5..6cd6fa2f272c 100644 --- a/kernel/rcu/srcutree.c +++ b/kernel/rcu/srcutree.c @@ -906,7 +906,7 @@ static void __synchronize_srcu(struct srcu_struct *ssp, bool do_norm) { struct rcu_synchronize rcu; - RCU_LOCKDEP_WARN(lock_is_held(&ssp->dep_map) || + RCU_LOCKDEP_WARN(lockdep_is_held(ssp) || lock_is_held(&rcu_bh_lock_map) || lock_is_held(&rcu_lock_map) || lock_is_held(&rcu_sched_lock_map), |