Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63859d4f authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

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: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a7558e01

kernel/sched.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}