Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6

[linux-2.6] / Documentation / RCU / torture.txt

diff --git a/Documentation/RCU/torture.txt b/Documentation/RCU/torture.txt
index 6714b5361158f01cdb038ef33c4f7f4f9305c66e..25a3c3f7d378f344676652aec19fad62853fc6b1 100644 (file)
--- a/Documentation/RCU/torture.txt
+++ b/Documentation/RCU/torture.txt
@@ -55,8 +55,10 @@ test_no_idle_hz      Whether or not to test the ability of RCU to operate in
 
 torture_type   The type of RCU to test: "rcu" for the rcu_read_lock() API,
                "rcu_sync" for rcu_read_lock() with synchronous reclamation,
-               "rcu_bh" for the rcu_read_lock_bh() API, and "srcu" for the
-               "srcu_read_lock()" API.
+               "rcu_bh" for the rcu_read_lock_bh() API, "rcu_bh_sync" for
+               rcu_read_lock_bh() with synchronous reclamation, "srcu" for
+               the "srcu_read_lock()" API, and "sched" for the use of
+               preempt_disable() together with synchronize_sched().
 
 verbose                Enable debug printk()s.  Default is disabled.