Merge branch 'for-3.5-take-2' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / kernel / wait.c

diff --git a/kernel/wait.c b/kernel/wait.c
index 26fa779..7fdd9ea 100644 (file)
--- a/kernel/wait.c
+++ b/kernel/wait.c
@@ -10,10 +10,10 @@
 #include <linux/wait.h>
 #include <linux/hash.h>
 
-void __init_waitqueue_head(wait_queue_head_t *q, struct lock_class_key *key)
+void __init_waitqueue_head(wait_queue_head_t *q, const char *name, struct lock_class_key *key)
 {
        spin_lock_init(&q->lock);
-       lockdep_set_class(&q->lock, key);
+       lockdep_set_class_and_name(&q->lock, key, name);
        INIT_LIST_HEAD(&q->task_list);
 }