diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-24 00:18:40 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-24 00:18:40 +0200 |
commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /Documentation/lockdep-design.txt | |
parent | Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 in... (diff) | |
parent | IXP4xx: support for Goramo MultiLink router platform. (diff) | |
download | linux-fc05505b77f7900a1bb74fb3f3a4343dee4265a4.tar.xz linux-fc05505b77f7900a1bb74fb3f3a4343dee4265a4.zip |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
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: 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. |