diff options
author | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 10:58:57 -0500 |
---|---|---|
committer | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 10:58:57 -0500 |
commit | a52079dad4718fa924ae81a939f8a665366f562b (patch) | |
tree | a9d6004f9bf1beff49cbfe0d5bf6edbf621b065d /Documentation/locking/locktorture.txt | |
parent | 24c8d0804be00da90af9efa8eb404bd7a3284ba9 (diff) | |
parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
download | linux-stable-a52079dad4718fa924ae81a939f8a665366f562b.tar.gz linux-stable-a52079dad4718fa924ae81a939f8a665366f562b.tar.bz2 linux-stable-a52079dad4718fa924ae81a939f8a665366f562b.zip |
Orangefs: Merge tag 'v4.4-rc1' into for-next
Linux 4.4-rc1
Diffstat (limited to 'Documentation/locking/locktorture.txt')
-rw-r--r-- | Documentation/locking/locktorture.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/locking/locktorture.txt b/Documentation/locking/locktorture.txt index 619f2bb136a5..a2ef3a929bf1 100644 --- a/Documentation/locking/locktorture.txt +++ b/Documentation/locking/locktorture.txt @@ -52,6 +52,9 @@ torture_type Type of lock to torture. By default, only spinlocks will o "mutex_lock": mutex_lock() and mutex_unlock() pairs. + o "rtmutex_lock": rtmutex_lock() and rtmutex_unlock() + pairs. Kernel must have CONFIG_RT_MUTEX=y. + o "rwsem_lock": read/write down() and up() semaphore pairs. torture_runnable Start locktorture at boot time in the case where the |