summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-09 14:56:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-09 14:56:51 -0700
commit713e3e1875749f341247a0c922e6ddd38fbd991c (patch)
tree0419bf8fbb3bf28a275d196bcdcb0d00cf773986 /Documentation
parent7b2aa037e878c939676675969983284a02958ae3 (diff)
parent0e692a94e378628b7d527260ad939894454bcca8 (diff)
Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: Fix typos in documentation lockdep: Fix file mode of lock_stat rtmutex: Avoid deadlock in rt_mutex_start_proxy_lock()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/lockdep-design.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/lockdep-design.txt b/Documentation/lockdep-design.txt
index e20d913d5914..abf768c681e2 100644
--- a/Documentation/lockdep-design.txt
+++ b/Documentation/lockdep-design.txt
@@ -30,9 +30,9 @@ State
The validator tracks lock-class usage history into 4n + 1 separate state bits:
- 'ever held in STATE context'
-- 'ever head as readlock in STATE context'
-- 'ever head with STATE enabled'
-- 'ever head as readlock with STATE enabled'
+- 'ever held as readlock in STATE context'
+- 'ever held with STATE enabled'
+- 'ever held as readlock with STATE enabled'
Where STATE can be either one of (kernel/lockdep_states.h)
- hardirq