2009-04-24 15:10:27

by Ming Lei

Subject: [PATCH] Documentation:lockdep-design: fix note of state bits

From: Ming Lei <[email protected]>

>From source code of get_usage_char(), the previous note is not correct,
so fix it.

static char get_usage_char(struct lock_class *class, enum lock_usage_bit bit)
{
char c = '.';

if (class->usage_mask & lock_flag(bit + 2))/*LOCK_ENABLED_##STATE*/
c = '+';
if (class->usage_mask & lock_flag(bit)) {/*LOCK_USED_IN_##STATE*/
c = '-';
if (class->usage_mask & lock_flag(bit + 2))
c = '?';
}

return c;
}
note:
1),The 'bit' parameter always is passed as LOCK_USED_IN_##STATE
or LOCK_USED_IN_##STATE_READ , from get_usage_chars().

Signed-off-by: Ming Lei <[email protected]>
---
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 938ea22..e20d913 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.
--
1.6.0.GIT

2009-04-26 16:43:25

by Ming Lei

Subject: [tip:core/urgent] locking: Documentation: lockdep-design.txt, fix note of state bits

Commit-ID: 992d7ced75322307035a0e94074eb7188612a680
Gitweb: http://git.kernel.org/tip/992d7ced75322307035a0e94074eb7188612a680
Author: Ming Lei <[email protected]>
AuthorDate: Fri, 24 Apr 2009 23:10:06 +0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Sun, 26 Apr 2009 18:21:24 +0200

locking: Documentation: lockdep-design.txt, fix note of state bits

>From source code of get_usage_char(), the previous note is not correct,
so fix it.

static char get_usage_char(struct lock_class *class, enum lock_usage_bit bit)
{
char c = '.';

if (class->usage_mask & lock_flag(bit + 2))/*LOCK_ENABLED_##STATE*/
c = '+';
if (class->usage_mask & lock_flag(bit)) {/*LOCK_USED_IN_##STATE*/
c = '-';
if (class->usage_mask & lock_flag(bit + 2))
c = '?';
}

return c;
}

note:

1) The 'bit' parameter always is passed as LOCK_USED_IN_##STATE
or LOCK_USED_IN_##STATE_READ , from get_usage_chars().

Signed-off-by: Ming Lei <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>


---
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 938ea22..e20d913 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.