diff options
author | Johannes Weiner <hannes@cmpxchg.org> | 2009-04-14 10:53:05 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-14 11:17:16 -0400 |
commit | 78ddb08feb7d4fbe3c0a9931804c51ee58be4023 (patch) | |
tree | 3cd3485561a9ac036003fd4da41fdc485cd5ac71 /kernel/sched.c | |
parent | e790fb0ba64bfec158e1219d899cb588275d12ab (diff) |
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/sched.c')
-rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 36d213bca473..92b4b56ad093 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -5345,7 +5345,7 @@ EXPORT_SYMBOL(default_wake_function); | |||
5345 | * started to run but is not in state TASK_RUNNING. try_to_wake_up() returns | 5345 | * started to run but is not in state TASK_RUNNING. try_to_wake_up() returns |
5346 | * zero in this (rare) case, and we handle it by continuing to scan the queue. | 5346 | * zero in this (rare) case, and we handle it by continuing to scan the queue. |
5347 | */ | 5347 | */ |
5348 | void __wake_up_common(wait_queue_head_t *q, unsigned int mode, | 5348 | static void __wake_up_common(wait_queue_head_t *q, unsigned int mode, |
5349 | int nr_exclusive, int sync, void *key) | 5349 | int nr_exclusive, int sync, void *key) |
5350 | { | 5350 | { |
5351 | wait_queue_t *curr, *next; | 5351 | wait_queue_t *curr, *next; |