[PATCH tip/core/rcu 06/23] rcu: fix now-bogus rcu_scheduler_active comments.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Paul E. McKenney
Date: Tuesday, April 20, 2010 - 2:44 pm

The rcu_scheduler_active check has been wrapped into the new
debug_lockdep_rcu_enabled() function, so update the comments to
reflect this new reality.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
 include/linux/rcupdate.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 40854c6..07c8591 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -111,7 +111,8 @@ extern int debug_lockdep_rcu_enabled(void);
  * this assumes we are in an RCU read-side critical section unless it can
  * prove otherwise.
  *
- * Check rcu_scheduler_active to prevent false positives during boot.
+ * Check debug_lockdep_rcu_enabled() to prevent false positives during boot
+ * and while lockdep is disabled.
  */
 static inline int rcu_read_lock_held(void)
 {
@@ -136,7 +137,8 @@ extern int rcu_read_lock_bh_held(void);
  * of preemption (including disabling irqs) counts as an RCU-sched
  * read-side critical section.
  *
- * Check rcu_scheduler_active to prevent false positives during boot.
+ * Check debug_lockdep_rcu_enabled() to prevent false positives during boot
+ * and while lockdep is disabled.
  */
 #ifdef CONFIG_PREEMPT
 static inline int rcu_read_lock_sched_held(void)
-- 
1.7.0

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH tip/core/rcu 0/23] v3 patches queued for 2.6.35, Paul E. McKenney, (Tue Apr 20, 2:44 pm)
[PATCH tip/core/rcu 02/23] rcu: make dead code really dead, Paul E. McKenney, (Tue Apr 20, 2:44 pm)
[PATCH tip/core/rcu 03/23] rcu: move some code from macro ..., Paul E. McKenney, (Tue Apr 20, 2:44 pm)
[PATCH tip/core/rcu 06/23] rcu: fix now-bogus rcu_schedule ..., Paul E. McKenney, (Tue Apr 20, 2:44 pm)
[PATCH tip/core/rcu 17/23] rcu: improve the RCU CPU-stall ..., Paul E. McKenney, (Tue Apr 20, 2:44 pm)
[PATCH tip/core/rcu 18/23] Debugobjects transition check, Paul E. McKenney, (Tue Apr 20, 2:44 pm)
[PATCH tip/core/rcu 21/23] rcu head remove init, Paul E. McKenney, (Tue Apr 20, 2:44 pm)
[PATCH tip/core/rcu 23/23] rcu: make SRCU usable in modules, Paul E. McKenney, (Tue Apr 20, 2:44 pm)