summaryrefslogtreecommitdiffstats
path: root/include/linux/srcu.h
diff options
context:
space:
mode:
authorPaul E. McKenney <paul.mckenney@linaro.org>2011-10-07 18:22:05 +0200
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2011-12-11 10:31:34 -0800
commit867f236bd12f5091df6dc7cc75f94d7fd982d78a (patch)
treea509f021062780e5a1f2ab8e5a63f7f016a14c28 /include/linux/srcu.h
parentff195cb69ba8d2af9b891be3a26db95fe1999d43 (diff)
downloadblackbird-op-linux-867f236bd12f5091df6dc7cc75f94d7fd982d78a.tar.gz
blackbird-op-linux-867f236bd12f5091df6dc7cc75f94d7fd982d78a.zip
rcu: Make srcu_read_lock_held() call common lockdep-enabled function
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>
Diffstat (limited to 'include/linux/srcu.h')
-rw-r--r--include/linux/srcu.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index 4e0a3d41dae3..d4b12443b2ef 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -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
@@ -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);
OpenPOWER on IntegriCloud