From 4d21b2c128d300270c22506ff542e877e4ef713a Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Tue, 30 Mar 2010 10:59:28 -0700 Subject: [PATCH] --- yaml --- r: 190999 b: refs/heads/master c: 32c141a0a1dfa29e0a07d78bec0c0919fc4b9f88 h: refs/heads/master i: 190997: 36262d5524a6245175332e05c2f8416ca654f552 190995: 949a1c27f66a337644e0c98773c934ef1f416ca4 190991: e2bb24632bc09c0c01fcd37fe586364d3e7aca99 v: v3 --- [refs] | 2 +- trunk/include/linux/rcupdate.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e151d02aade0..03d29ac3df01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d20200b591f59847ab6a5c23507084a7d29e23c5 +refs/heads/master: 32c141a0a1dfa29e0a07d78bec0c0919fc4b9f88 diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h index a150af0e5cd5..02537a72aaa4 100644 --- a/trunk/include/linux/rcupdate.h +++ b/trunk/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)