diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-16 11:50:10 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-16 11:50:10 +0200 |
| commit | 3e2bcad89814030ad6a369a97ad1481fd35938d3 (patch) | |
| tree | 8d6b9b163dc9ed44ec377ca5b57be1a1fb80f923 /kernel/wait.c | |
| parent | dcbf77cac640af0ab944d5cbb07934bf6708b4d9 (diff) | |
| parent | b2add73dbf93fd50f00564d7abc3e2b9aa9dd20c (diff) | |
| download | linux-3e2bcad89814030ad6a369a97ad1481fd35938d3.tar.bz2 | |
Merge branch 'master' into for-linus
Diffstat (limited to 'kernel/wait.c')
| -rw-r--r-- | kernel/wait.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/wait.c b/kernel/wait.c index ea7c3b4275cf..c4bd3d825f35 100644 --- a/kernel/wait.c +++ b/kernel/wait.c @@ -10,13 +10,14 @@ #include <linux/wait.h> #include <linux/hash.h> -void init_waitqueue_head(wait_queue_head_t *q) +void __init_waitqueue_head(wait_queue_head_t *q, struct lock_class_key *key) { spin_lock_init(&q->lock); + lockdep_set_class(&q->lock, key); INIT_LIST_HEAD(&q->task_list); } -EXPORT_SYMBOL(init_waitqueue_head); +EXPORT_SYMBOL(__init_waitqueue_head); void add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait) { |