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

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

sched/wait: Collapse __wait_event_interruptible_exclusive() 



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.541716442@infradead.org


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

include/linux/wait.h

+2 −20
Original line number Diff line number Diff line
@@ -421,26 +421,8 @@ do { \ 
})



#define __wait_event_interruptible_exclusive(wq, condition, ret)	\

do {									\

	__label__ __out;						\

	DEFINE_WAIT(__wait);						\

									\

	for (;;) {							\

		prepare_to_wait_exclusive(&wq, &__wait,			\

					TASK_INTERRUPTIBLE);		\

		if (condition)						\

			break;						\

		if (signal_pending(current)) {				\

			ret = -ERESTARTSYS;				\

			abort_exclusive_wait(&wq, &__wait, 		\

				TASK_INTERRUPTIBLE, NULL);		\

			goto __out;					\

		}							\

		schedule();						\

	}								\

	finish_wait(&wq, &__wait);					\

__out:	;								\

} while (0)

	___wait_event(wq, condition, TASK_INTERRUPTIBLE, 1, ret,	\

		      schedule())



#define wait_event_interruptible_exclusive(wq, condition)		\

({									\