summaryrefslogtreecommitdiff
path: root/kernel/wait.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-01-20 12:10:09 +0100
committerTakashi Iwai <tiwai@suse.de>2012-01-20 12:10:09 +0100
commiteefad7fd53eae2eb8d1e205b1d3a18f67e4e6b46 (patch)
tree497ef1a21d90c63ac2e4ca6389c0844d0d72b0a8 /kernel/wait.c
parentb9ecc4ee28a5ff5b3997da247cd9df1320c602a9 (diff)
parentac9ef6cf9196107115930e9fc66207199ef395b3 (diff)
Merge branch 'topic/convert-bint' into topic/hda
Merge the conversions to bint module option type.
Diffstat (limited to 'kernel/wait.c')
-rw-r--r--kernel/wait.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/wait.c b/kernel/wait.c
index 26fa7797f90f..7fdd9eaca2c3 100644
--- 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);
}