summaryrefslogtreecommitdiffstats
path: root/kernel/wait.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-12-13 13:20:54 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-21 10:07:39 +0100
commitf07fdec50a13f134ea9608c8fb3f6408c58ef55e (patch)
tree4e631c518335ddc5227803517a8cd55f3c992206 /kernel/wait.c
parentMerge commit 'v3.2-rc6' into core/locking (diff)
downloadlinux-f07fdec50a13f134ea9608c8fb3f6408c58ef55e.tar.xz
linux-f07fdec50a13f134ea9608c8fb3f6408c58ef55e.zip
lockdep/waitqueues: Add better annotation
-> #2 (&tty->write_wait){-.-...}: is a lot more informative than: -> #2 (key#19){-.....}: Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/n/tip-8zpopbny51023rdb0qq67eye@git.kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
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);
}