提交 63859d4f 编写于 作者: P Peter Zijlstra 提交者: Ingo Molnar

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: NPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
上级 a7558e01
...@@ -5564,10 +5564,10 @@ asmlinkage void __sched preempt_schedule_irq(void) ...@@ -5564,10 +5564,10 @@ asmlinkage void __sched preempt_schedule_irq(void)
#endif /* CONFIG_PREEMPT */ #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) 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); EXPORT_SYMBOL(default_wake_function);
...@@ -5581,14 +5581,14 @@ 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. * 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, 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; wait_queue_t *curr, *next;
list_for_each_entry_safe(curr, next, &q->task_list, task_list) { list_for_each_entry_safe(curr, next, &q->task_list, task_list) {
unsigned flags = curr->flags; 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) (flags & WQ_FLAG_EXCLUSIVE) && !--nr_exclusive)
break; break;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册