diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:33:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 03:33:15 -0400 |
| commit | 134cbf35c739bf89c51fd975a33a6b87507482c4 (patch) | |
| tree | c30536dcbb6e99a0f204879bbe5a19bfb27cccf8 /Documentation/lockdep-design.txt | |
| parent | 2feceeff1e771850e49f9074307f071964fd9e3e (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into x86/mm
Merge reason: this branch was on a .30-rc2 base - sync it up with
all the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/lockdep-design.txt')
| -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. |