diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2010-03-30 13:52:21 -0400 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2010-05-10 14:08:32 -0400 |
| commit | d20200b591f59847ab6a5c23507084a7d29e23c5 (patch) | |
| tree | 565d6f26eae873ab7c1b4ee406e5e767dabd24f0 | |
| parent | 5db356736acb9ba717df1aa9444e4e44cbb30a71 (diff) | |
rcu: Fix bogus CONFIG_PROVE_LOCKING in comments to reflect reality.
It is CONFIG_DEBUG_LOCK_ALLOC rather than CONFIG_PROVE_LOCKING, so fix it.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
| -rw-r--r-- | include/linux/rcupdate.h | 15 | ||||
| -rw-r--r-- | include/linux/srcu.h | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 4dca2752cfde..a150af0e5cd5 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h | |||
| @@ -106,8 +106,8 @@ extern int debug_lockdep_rcu_enabled(void); | |||
| 106 | /** | 106 | /** |
| 107 | * rcu_read_lock_held - might we be in RCU read-side critical section? | 107 | * rcu_read_lock_held - might we be in RCU read-side critical section? |
| 108 | * | 108 | * |
| 109 | * If CONFIG_PROVE_LOCKING is selected and enabled, returns nonzero iff in | 109 | * If CONFIG_DEBUG_LOCK_ALLOC is selected, returns nonzero iff in an RCU |
| 110 | * an RCU read-side critical section. In absence of CONFIG_PROVE_LOCKING, | 110 | * read-side critical section. In absence of CONFIG_DEBUG_LOCK_ALLOC, |
| 111 | * this assumes we are in an RCU read-side critical section unless it can | 111 | * this assumes we are in an RCU read-side critical section unless it can |
| 112 | * prove otherwise. | 112 | * prove otherwise. |
| 113 | * | 113 | * |
| @@ -129,11 +129,12 @@ extern int rcu_read_lock_bh_held(void); | |||
| 129 | /** | 129 | /** |
| 130 | * rcu_read_lock_sched_held - might we be in RCU-sched read-side critical section? | 130 | * rcu_read_lock_sched_held - might we be in RCU-sched read-side critical section? |
| 131 | * | 131 | * |
| 132 | * If CONFIG_PROVE_LOCKING is selected and enabled, returns nonzero iff in an | 132 | * If CONFIG_DEBUG_LOCK_ALLOC is selected, returns nonzero iff in an |
| 133 | * RCU-sched read-side critical section. In absence of CONFIG_PROVE_LOCKING, | 133 | * RCU-sched read-side critical section. In absence of |
| 134 | * this assumes we are in an RCU-sched read-side critical section unless it | 134 | * CONFIG_DEBUG_LOCK_ALLOC, this assumes we are in an RCU-sched read-side |
| 135 | * can prove otherwise. Note that disabling of preemption (including | 135 | * critical section unless it can prove otherwise. Note that disabling |
| 136 | * disabling irqs) counts as an RCU-sched read-side critical section. | 136 | * of preemption (including disabling irqs) counts as an RCU-sched |
| 137 | * read-side critical section. | ||
| 137 | * | 138 | * |
| 138 | * Check rcu_scheduler_active to prevent false positives during boot. | 139 | * Check rcu_scheduler_active to prevent false positives during boot. |
| 139 | */ | 140 | */ |
diff --git a/include/linux/srcu.h b/include/linux/srcu.h index 4d5ecb222af9..9c01f1022428 100644 --- a/include/linux/srcu.h +++ b/include/linux/srcu.h | |||
| @@ -84,8 +84,8 @@ long srcu_batches_completed(struct srcu_struct *sp); | |||
| 84 | /** | 84 | /** |
| 85 | * srcu_read_lock_held - might we be in SRCU read-side critical section? | 85 | * srcu_read_lock_held - might we be in SRCU read-side critical section? |
| 86 | * | 86 | * |
| 87 | * If CONFIG_PROVE_LOCKING is selected and enabled, returns nonzero iff in | 87 | * If CONFIG_DEBUG_LOCK_ALLOC is selected, returns nonzero iff in an SRCU |
| 88 | * an SRCU read-side critical section. In absence of CONFIG_PROVE_LOCKING, | 88 | * read-side critical section. In absence of CONFIG_DEBUG_LOCK_ALLOC, |
| 89 | * this assumes we are in an SRCU read-side critical section unless it can | 89 | * this assumes we are in an SRCU read-side critical section unless it can |
| 90 | * prove otherwise. | 90 | * prove otherwise. |
| 91 | */ | 91 | */ |
