sched: Fix sync wakeups again
Commit-ID: 63859d4fe4c97b737e7adbfe60acb1c2b2e668cb Gitweb: http://git.kernel.org/tip/63859d4fe4c97b737e7adbfe60acb1c2b2e668cb Author: Peter Zijlstra <[email protected]> AuthorDate: Tue, 15 Sep 2009 19:14:42 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 15 Sep 2009 19:47:22 +0200
sched: Fix sync wakeups again
The sync argument rename to introduce WF_* broke stuff by missing a local alias for an argument in __wake_up_common, fix it by using the more descriptive wake_flags name.
This restores WF_SYNC propagation, which fixes wake_affine() behaviour, which fixes pipe-test.
Signed-off-by Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/sched.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
kernel/sched.c +4 -4
@@ -5564,10 +5564,10 @@ asmlinkage void __sched preempt_schedule_irq(void)#endif /* CONFIG_PREEMPT */ -int default_wake_function (wait_queue_t *curr,unsigned mode,int flags, +int default_wake_function (wait_queue_t *curr,unsigned mode,int wake_flags,void *key) { -return try_to_wake_up (curr->private, mode, flags); +return try_to_wake_up (curr->private, mode, wake_flags); }EXPORT_SYMBOL (default_wake_function);
@@ -5581,14 +5581,14 @@ EXPORT_SYMBOL(default_wake_function);* zero in this (rare) case, and we handle it by continuing to scan the queue. */ static void __wake_up_common (wait_queue_head_t *q,unsigned int mode, -int nr_exclusive,int flags,void *key) +int nr_exclusive,int wake_flags,void *key) {wait_queue_t *curr, *next;list_for_each_entry_safe (curr, next, &q->task_list, task_list) {unsigned flags = curr->flags; -if (curr->func (curr, mode, flags, key) && +if (curr->func (curr, mode, wake_flags, key) && (flags &WQ_FLAG_EXCLUSIVE ) && !--nr_exclusive)break ; }