lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sched: Fix sync wakeups again

Browse Source 
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 <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra
2009-09-15 19:14:42 +02:00
committed by Ingo Molnar
parent a7558e0105
commit 63859d4fe4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/sched.c
View File

@@ -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);
* 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;
} }