diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 15:08:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 15:08:20 -0400 |
| commit | da87bbd14299ef43848742c44dfe05fa1da5a21f (patch) | |
| tree | ac28a7cf89fbcad8cc18f71c041c520d216ec091 /Documentation | |
| parent | e91b3b2681148371d84b9cdf4cab6f9de0522544 (diff) | |
| parent | 6e85c5ba73c07b990798087e9b858c065db2b234 (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
kernel/posix-cpu-timers.c: fix sparse warning
dma-debug: remove broken dma memory leak detection for 2.6.30
locking: Documentation: lockdep-design.txt, fix note of state bits
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 938ea22f2cc0..e20d913d5914 100644 --- a/Documentation/lockdep-design.txt +++ b/Documentation/lockdep-design.txt | |||
| @@ -54,9 +54,9 @@ locking error messages, inside curlies. A contrived example: | |||
| 54 | The bit position indicates STATE, STATE-read, for each of the states listed | 54 | The bit position indicates STATE, STATE-read, for each of the states listed |
| 55 | above, and the character displayed in each indicates: | 55 | above, and the character displayed in each indicates: |
| 56 | 56 | ||
| 57 | '.' acquired while irqs disabled | 57 | '.' acquired while irqs disabled and not in irq context |
| 58 | '+' acquired in irq context | 58 | '-' acquired in irq context |
| 59 | '-' acquired with irqs enabled | 59 | '+' acquired with irqs enabled |
| 60 | '?' acquired in irq context with irqs enabled. | 60 | '?' acquired in irq context with irqs enabled. |
| 61 | 61 | ||
| 62 | Unused mutexes cannot be part of the cause of an error. | 62 | Unused mutexes cannot be part of the cause of an error. |