diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-10-09 08:39:25 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-10-09 08:39:25 +0200 |
commit | fd19bda491207f66d39aeba93487197a087bc00b (patch) | |
tree | 55d7b07835f045144e2d529bb20136486d1b6691 /Documentation | |
parent | 62731433591156ece255e23ffd69ea4544b424f1 (diff) | |
parent | 3e28e377204badfc3c4119ff2abda473127ee0ff (diff) | |
download | linux-fd19bda491207f66d39aeba93487197a087bc00b.tar.bz2 |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull additional commits for locktorture, from Paul E. McKenney.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/locking/locktorture.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/locking/locktorture.txt b/Documentation/locking/locktorture.txt index be715015e0f7..619f2bb136a5 100644 --- a/Documentation/locking/locktorture.txt +++ b/Documentation/locking/locktorture.txt @@ -45,6 +45,11 @@ torture_type Type of lock to torture. By default, only spinlocks will o "spin_lock_irq": spin_lock_irq() and spin_unlock_irq() pairs. + o "rw_lock": read/write lock() and unlock() rwlock pairs. + + o "rw_lock_irq": read/write lock_irq() and unlock_irq() + rwlock pairs. + o "mutex_lock": mutex_lock() and mutex_unlock() pairs. o "rwsem_lock": read/write down() and up() semaphore pairs. |