From: Ingo Molnar <mingo@elte.hu>

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>
---

 include/linux/wait.h |    6 ++++++
 kernel/wait.c        |    4 ++++
 2 files changed, 10 insertions(+)

diff -puN include/linux/wait.h~lockdep-annotate-waitqueues include/linux/wait.h
--- a/include/linux/wait.h~lockdep-annotate-waitqueues
+++ a/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 -puN kernel/wait.c~lockdep-annotate-waitqueues kernel/wait.c
--- a/kernel/wait.c~lockdep-annotate-waitqueues
+++ a/kernel/wait.c
@@ -11,6 +11,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;
_