1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt
index 97ded2432c59..e41a7fecf0d3 100644
--- a/Documentation/RCU/whatisRCU.txt
+++ b/Documentation/RCU/whatisRCU.txt
@@ -136,10 +136,10 @@ rcu_read_lock()
        Used by a reader to inform the reclaimer that the reader is
        entering an RCU read-side critical section.  It is illegal
        to block while in an RCU read-side critical section, though
-        kernels built with CONFIG_PREEMPT_RCU can preempt RCU read-side
+        kernels built with CONFIG_TREE_PREEMPT_RCU can preempt RCU
-        critical sections.  Any RCU-protected data structure accessed
+        read-side critical sections.  Any RCU-protected data structure
-        during an RCU read-side critical section is guaranteed to remain
+        accessed during an RCU read-side critical section is guaranteed to
-        unreclaimed for the full duration of that critical section.
+        remain unreclaimed for the full duration of that critical section.
        Reference counts may be used in conjunction with RCU to maintain
        longer-term references to data structures.

diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt index 97ded2432c59..e41a7fecf0d3 100644 --- a/Documentation/RCU/whatisRCU.txt +++ b/Documentation/RCU/whatisRCU.txt
@@ -136,10 +136,10 @@ rcu_read_lock()
136	Used by a reader to inform the reclaimer that the reader is	136	Used by a reader to inform the reclaimer that the reader is
137	entering an RCU read-side critical section. It is illegal	137	entering an RCU read-side critical section. It is illegal
138	to block while in an RCU read-side critical section, though	138	to block while in an RCU read-side critical section, though
139	kernels built with CONFIG_PREEMPT_RCU can preempt RCU read-side	139	kernels built with CONFIG_TREE_PREEMPT_RCU can preempt RCU
140	critical sections. Any RCU-protected data structure accessed	140	read-side critical sections. Any RCU-protected data structure
141	during an RCU read-side critical section is guaranteed to remain	141	accessed during an RCU read-side critical section is guaranteed to
142	unreclaimed for the full duration of that critical section.	142	remain unreclaimed for the full duration of that critical section.
143	Reference counts may be used in conjunction with RCU to maintain	143	Reference counts may be used in conjunction with RCU to maintain
144	longer-term references to data structures.	144	longer-term references to data structures.
145		145