aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 12:08:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 12:08:20 -0700
commitda87bbd14299ef43848742c44dfe05fa1da5a21f (patch)
treeac28a7cf89fbcad8cc18f71c041c520d216ec091 /Documentation
parente91b3b2681148371d84b9cdf4cab6f9de0522544 (diff)
parent6e85c5ba73c07b990798087e9b858c065db2b234 (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.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/lockdep-design.txt b/Documentation/lockdep-design.txt
index 938ea22f2cc..e20d913d591 100644
--- a/Documentation/lockdep-design.txt
+++ b/Documentation/lockdep-design.txt
@@ -54,9 +54,9 @@ locking error messages, inside curlies. A contrived example:
The bit position indicates STATE, STATE-read, for each of the states listed
above, and the character displayed in each indicates:
- '.' acquired while irqs disabled
- '+' acquired in irq context
- '-' acquired with irqs enabled
+ '.' acquired while irqs disabled and not in irq context
+ '-' acquired in irq context
+ '+' acquired with irqs enabled
'?' acquired in irq context with irqs enabled.
Unused mutexes cannot be part of the cause of an error.