Merge branches 'rcu/fixes', 'rcu/nocb', 'rcu/torture', 'rcu/stall' and 'rcu/srcu...

[linux.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 1518343bbe2237f1d577df5656339d6224b769be..686ea876a89c7d08836490fe15bb81c8bb96cf39 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5412,11 +5412,6 @@
                        Set time (jiffies) between CPU-hotplug operations,
                        or zero to disable CPU-hotplug testing.
 
-       rcutorture.read_exit= [KNL]
-                       Set the number of read-then-exit kthreads used
-                       to test the interaction of RCU updaters and
-                       task-exit processing.
-
        rcutorture.read_exit_burst= [KNL]
                        The number of times in a given read-then-exit
                        episode that a set of read-then-exit kthreads
@@ -5426,6 +5421,14 @@
                        The delay, in seconds, between successive
                        read-then-exit testing episodes.
 
+       rcutorture.reader_flavor= [KNL]
+                       A bit mask indicating which readers to use.
+                       If there is more than one bit set, the readers
+                       are entered from low-order bit up, and are
+                       exited in the opposite order.  For SRCU, the
+                       0x1 bit is normal readers, 0x2 NMI-safe readers,
+                       and 0x4 light-weight readers.
+
        rcutorture.shuffle_interval= [KNL]
                        Set task-shuffle interval (s).  Shuffling tasks
                        allows some CPUs to go into dyntick-idle mode