diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-09 17:56:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-09 17:56:51 -0400 |
| commit | 713e3e1875749f341247a0c922e6ddd38fbd991c (patch) | |
| tree | 0419bf8fbb3bf28a275d196bcdcb0d00cf773986 /Documentation | |
| parent | 7b2aa037e878c939676675969983284a02958ae3 (diff) | |
| parent | 0e692a94e378628b7d527260ad939894454bcca8 (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.txt | 6 |
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 | |||
| 30 | The validator tracks lock-class usage history into 4n + 1 separate state bits: | 30 | The validator tracks lock-class usage history into 4n + 1 separate state bits: |
| 31 | 31 | ||
| 32 | - 'ever held in STATE context' | 32 | - 'ever held in STATE context' |
| 33 | - 'ever head as readlock in STATE context' | 33 | - 'ever held as readlock in STATE context' |
| 34 | - 'ever head with STATE enabled' | 34 | - 'ever held with STATE enabled' |
| 35 | - 'ever head as readlock with STATE enabled' | 35 | - 'ever held as readlock with STATE enabled' |
| 36 | 36 | ||
| 37 | Where STATE can be either one of (kernel/lockdep_states.h) | 37 | Where STATE can be either one of (kernel/lockdep_states.h) |
| 38 | - hardirq | 38 | - hardirq |