summaryrefslogtreecommitdiffstats
path: root/kernel/wait.c
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2009-04-14 16:53:05 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-14 17:17:16 +0200
commit78ddb08feb7d4fbe3c0a9931804c51ee58be4023 (patch)
tree3cd3485561a9ac036003fd4da41fdc485cd5ac71 /kernel/wait.c
parente790fb0ba64bfec158e1219d899cb588275d12ab (diff)
downloadlinux-78ddb08feb7d4fbe3c0a9931804c51ee58be4023.tar.gz
linux-78ddb08feb7d4fbe3c0a9931804c51ee58be4023.tar.bz2
linux-78ddb08feb7d4fbe3c0a9931804c51ee58be4023.zip
wait: don't use __wake_up_common()
'777c6c5 wait: prevent exclusive waiter starvation' made __wake_up_common() global to be used from abort_exclusive_wait(). It was needed to do a wake-up with the waitqueue lock held while passing down a key to the wake-up function. Since '4ede816 epoll keyed wakeups: add __wake_up_locked_key() and __wake_up_sync_key()' there is an appropriate wrapper for this case: __wake_up_locked_key(). Use it here and make __wake_up_common() private to the scheduler again. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <1239720785-19661-1-git-send-email-hannes@cmpxchg.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/wait.c')
-rw-r--r--kernel/wait.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/wait.c b/kernel/wait.c
index 42a2dbc181c8..ea7c3b4275cf 100644
--- a/kernel/wait.c
+++ b/kernel/wait.c
@@ -154,7 +154,7 @@ void abort_exclusive_wait(wait_queue_head_t *q, wait_queue_t *wait,
if (!list_empty(&wait->task_list))
list_del_init(&wait->task_list);
else if (waitqueue_active(q))
- __wake_up_common(q, mode, 1, 0, key);
+ __wake_up_locked_key(q, mode, key);
spin_unlock_irqrestore(&q->lock, flags);
}
EXPORT_SYMBOL(abort_exclusive_wait);