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

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

sched/wait: Collapse __wait_event_killable() 



Reduce macro complexity by using the new ___wait_event() helper.
No change in behaviour, identical generated code.

Reviewed-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092528.898691966@infradead.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0d1e1c8a

include/linux/wait.h

+1 −16
Original line number Diff line number Diff line
@@ -582,22 +582,7 @@ do { \ 




#define __wait_event_killable(wq, condition, ret)			\

do {									\

	DEFINE_WAIT(__wait);						\

									\

	for (;;) {							\

		prepare_to_wait(&wq, &__wait, TASK_KILLABLE);		\

		if (condition)						\

			break;						\

		if (!fatal_signal_pending(current)) {			\

			schedule();					\

			continue;					\

		}							\

		ret = -ERESTARTSYS;					\

		break;							\

	}								\

	finish_wait(&wq, &__wait);					\

} while (0)

	___wait_event(wq, condition, TASK_KILLABLE, 0, ret, schedule())



/**

 * wait_event_killable - sleep until a condition gets true