diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-07-03 00:25:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 15:27:07 -0700 |
| commit | eb4542b98c81e22e08587b747b21986a45360999 (patch) | |
| tree | e983cc095333c11bed51950ed39ad3a51d140398 | |
| parent | 243c7621aac4ed1aa79524c9a1cecf7c05a28124 (diff) | |
| download | linux-eb4542b98c81e22e08587b747b21986a45360999.tar.gz linux-eb4542b98c81e22e08587b747b21986a45360999.tar.bz2 linux-eb4542b98c81e22e08587b747b21986a45360999.zip | |
[PATCH] lockdep: annotate waitqueues
Create one lock class for all waitqueue locks in the kernel. Has no effect on
non-lockdep kernels.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/linux/wait.h | 6 | ||||
| -rw-r--r-- | kernel/wait.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index bc4f389c49bb..794be7af58ae 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -77,9 +77,15 @@ struct task_struct; #define __WAIT_BIT_KEY_INITIALIZER(word, bit) \ { .flags = word, .bit_nr = bit, } +/* + * lockdep: we want one lock-class for all waitqueue locks. + */ +extern struct lock_class_key waitqueue_lock_key; + static inline void init_waitqueue_head(wait_queue_head_t *q) { spin_lock_init(&q->lock); + lockdep_set_class(&q->lock, &waitqueue_lock_key); INIT_LIST_HEAD(&q->task_list); } diff --git a/kernel/wait.c b/kernel/wait.c index 5985d866531f..a1d57aeb7f75 100644 --- a/kernel/wait.c +++ b/kernel/wait.c @@ -10,6 +10,10 @@ #include <linux/wait.h> #include <linux/hash.h> +struct lock_class_key waitqueue_lock_key; + +EXPORT_SYMBOL(waitqueue_lock_key); + void fastcall add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait) { unsigned long flags; |