summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-13 12:09:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-13 12:09:16 -0700
commit919aa96a9cfc5071f037bf58718e05335562a6ac (patch)
tree00f55468065e2f290aa3f24bdc61654f82da9dcc /include
parent1c2ffff407140adf75bb72ae375688480793a228 (diff)
parent392741e0a4e17c82e3978b7fcbf04291294dc0a1 (diff)
downloadlinux-3.10-919aa96a9cfc5071f037bf58718e05335562a6ac.tar.gz
linux-3.10-919aa96a9cfc5071f037bf58718e05335562a6ac.tar.bz2
linux-3.10-919aa96a9cfc5071f037bf58718e05335562a6ac.zip
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: Fix handling of bad requeue syscall pairing futex: Fix compat_futex to be same as futex for REQUEUE_PI locking, sched: Give waitqueue spinlocks their own lockdep classes futex: Update futex_q lock_ptr on requeue proxy lock
Diffstat (limited to 'include')
-rw-r--r--include/linux/wait.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 6788e1a4d4c..cf3c2f5dba5 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -77,7 +77,14 @@ struct task_struct;
#define __WAIT_BIT_KEY_INITIALIZER(word, bit) \
{ .flags = word, .bit_nr = bit, }
-extern void init_waitqueue_head(wait_queue_head_t *q);
+extern void __init_waitqueue_head(wait_queue_head_t *q, struct lock_class_key *);
+
+#define init_waitqueue_head(q) \
+ do { \
+ static struct lock_class_key __key; \
+ \
+ __init_waitqueue_head((q), &__key); \
+ } while (0)
#ifdef CONFIG_LOCKDEP
# define __WAIT_QUEUE_HEAD_INIT_ONSTACK(name) \