diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-13 12:09:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-13 12:09:16 -0700 |
| commit | 919aa96a9cfc5071f037bf58718e05335562a6ac (patch) | |
| tree | 00f55468065e2f290aa3f24bdc61654f82da9dcc /kernel/wait.c | |
| parent | 1c2ffff407140adf75bb72ae375688480793a228 (diff) | |
| parent | 392741e0a4e17c82e3978b7fcbf04291294dc0a1 (diff) | |
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 '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 ea7c3b4275c..c4bd3d825f3 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) { |