Skip to content

Commit

Permalink
rcu: Make srcu_read_lock_held() call common lockdep-enabled function
Browse files Browse the repository at this point in the history
A common debug_lockdep_rcu_enabled() function is used to check whether
RCU lockdep splats should be reported, but srcu_read_lock() does not
use it.  This commit therefore brings srcu_read_lock_held() up to date.

Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
  • Loading branch information
Paul E. McKenney authored and Paul E. McKenney committed Dec 11, 2011
1 parent ff195cb commit 867f236
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion include/linux/srcu.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ long srcu_batches_completed(struct srcu_struct *sp);
* this assumes we are in an SRCU read-side critical section unless it can
* prove otherwise.
*
* Checks debug_lockdep_rcu_enabled() to prevent false positives during boot
* and while lockdep is disabled.
*
* Note that if the CPU is in the idle loop from an RCU point of view
* (ie: that we are in the section between rcu_idle_enter() and
* rcu_idle_exit()) then srcu_read_lock_held() returns false even if
Expand All @@ -102,7 +105,7 @@ static inline int srcu_read_lock_held(struct srcu_struct *sp)
if (rcu_is_cpu_idle())
return 0;

if (!debug_locks)
if (!debug_lockdep_rcu_enabled())
return 1;

return lock_is_held(&sp->dep_map);
Expand Down

0 comments on commit 867f236

Please sign in to comment.