diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 09:51:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 09:51:40 -0400 |
| commit | 6d5f0ebfc0be9cbfeaafdd9258d5fa24b7975a36 (patch) | |
| tree | 3b7a5851a3d9f02441e2dcbaf22785d131544544 /lib | |
| parent | dbb885fecc1b1b35e93416bedd24d21bd20f60ed (diff) | |
| parent | 8acd91e8620836a56ff62028ed28ba629f2881a0 (diff) | |
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core locking updates from Ingo Molnar:
"The main updates in this cycle were:
- mutex MCS refactoring finishing touches: improve comments, refactor
and clean up code, reduce debug data structure footprint, etc.
- qrwlock finishing touches: remove old code, self-test updates.
- small rwsem optimization
- various smaller fixes/cleanups"
* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/lockdep: Revert qrwlock recusive stuff
locking/rwsem: Avoid double checking before try acquiring write lock
locking/rwsem: Move EXPORT_SYMBOL() lines to follow function definition
locking/rwlock, x86: Delete unused asm/rwlock.h and rwlock.S
locking/rwlock, x86: Clean up asm/spinlock*.h to remove old rwlock code
locking/semaphore: Resolve some shadow warnings
locking/selftest: Support queued rwlock
locking/lockdep: Restrict the use of recursive read_lock() with qrwlock
locking/spinlocks: Always evaluate the second argument of spin_lock_nested()
locking/Documentation: Update locking/mutex-design.txt disadvantages
locking/Documentation: Move locking related docs into Documentation/locking/
locking/mutexes: Use MUTEX_SPIN_ON_OWNER when appropriate
locking/mutexes: Refactor optimistic spinning code
locking/mcs: Remove obsolete comment
locking/mutexes: Document quick lock release when unlocking
locking/mutexes: Standardize arguments in lock/unlock slowpaths
locking: Remove deprecated smp_mb__() barriers
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 3ac43f34437b..49d5fb754e88 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -952,7 +952,7 @@ config PROVE_LOCKING | |||
| 952 | the proof of observed correctness is also maintained for an | 952 | the proof of observed correctness is also maintained for an |
| 953 | arbitrary combination of these separate locking variants. | 953 | arbitrary combination of these separate locking variants. |
| 954 | 954 | ||
| 955 | For more details, see Documentation/lockdep-design.txt. | 955 | For more details, see Documentation/locking/lockdep-design.txt. |
| 956 | 956 | ||
| 957 | config LOCKDEP | 957 | config LOCKDEP |
| 958 | bool | 958 | bool |
| @@ -973,7 +973,7 @@ config LOCK_STAT | |||
| 973 | help | 973 | help |
| 974 | This feature enables tracking lock contention points | 974 | This feature enables tracking lock contention points |
| 975 | 975 | ||
| 976 | For more details, see Documentation/lockstat.txt | 976 | For more details, see Documentation/locking/lockstat.txt |
| 977 | 977 | ||
| 978 | This also enables lock events required by "perf lock", | 978 | This also enables lock events required by "perf lock", |
| 979 | subcommand of perf. | 979 | subcommand of perf. |