sched/wait: Collapse __wait_event_timeout()

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

Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092528.325264677@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2013-10-02 11:22:23 +02:00 committed by Ingo Molnar
parent 854267f438
commit ddc1994b82

View file

@ -247,17 +247,9 @@ do { \
} while (0)
#define __wait_event_timeout(wq, condition, ret) \
do { \
DEFINE_WAIT(__wait); \
\
for (;;) { \
prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \
if (___wait_cond_timeout(condition, ret)) \
break; \
ret = schedule_timeout(ret); \
} \
finish_wait(&wq, &__wait); \
} while (0)
___wait_event(wq, ___wait_cond_timeout(condition, ret), \
TASK_UNINTERRUPTIBLE, 0, ret, \
ret = schedule_timeout(ret))
/**
* wait_event_timeout - sleep until a condition gets true or a timeout elapses