diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 18:17:19 +0200 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 18:19:31 +0200 |
commit | 9b4f2e9576658c4e52d95dc8d309f51b2e2db096 (patch) | |
tree | 7b1902b0f931783fccc6fee45c6f9c16b4fde5ce /kernel/wait.c | |
parent | [PATCH] ieee1394: fix kerneldoc of hpsb_alloc_host (diff) | |
parent | Merge branch 'master' into upstream-fixes (diff) | |
download | linux-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.tar.xz linux-9b4f2e9576658c4e52d95dc8d309f51b2e2db096.zip |
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'kernel/wait.c')
-rw-r--r-- | kernel/wait.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/wait.c b/kernel/wait.c index 5985d866531f..59a82f63275d 100644 --- a/kernel/wait.c +++ b/kernel/wait.c @@ -10,6 +10,14 @@ #include <linux/wait.h> #include <linux/hash.h> +void init_waitqueue_head(wait_queue_head_t *q) +{ + spin_lock_init(&q->lock); + INIT_LIST_HEAD(&q->task_list); +} + +EXPORT_SYMBOL(init_waitqueue_head); + void fastcall add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait) { unsigned long flags; |