summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-08-09 16:13:50 +0200
committerIngo Molnar <mingo@elte.hu>2009-08-09 16:13:50 +0200
commit20ba32789c24a9969e846cbf9364e2e36fe3a458 (patch)
tree90d5df956b9b49ac7050ec9f4255b11c2dd8c23d /Documentation
parent7b2aa037e878c939676675969983284a02958ae3 (diff)
parent00235fe25eba6d3a13f3349b2e3a2d94b699a414 (diff)
Merge branch 'core/urgent' into auto-core-next
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