diff options
author | Peter Zijlstra <peterz@infradead.org> | 2013-10-02 11:22:22 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-04 10:14:46 +0200 |
commit | 854267f4384243b19c03a2942e84f06f2beb0952 (patch) | |
tree | 99d2a0597ce1283376e0d55096f647efb4b821a5 /include | |
parent | 41a1431b178c3b731d6dfc40b987528b333dd93e (diff) |
sched/wait: Collapse __wait_event()
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.254863348@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/wait.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index 29d0249e03a..68e3a628e15 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -224,17 +224,8 @@ __out: ; \ } while (0) #define __wait_event(wq, condition) \ -do { \ - DEFINE_WAIT(__wait); \ - \ - for (;;) { \ - prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \ - if (condition) \ - break; \ - schedule(); \ - } \ - finish_wait(&wq, &__wait); \ -} while (0) + ___wait_event(wq, condition, TASK_UNINTERRUPTIBLE, 0, \ + ___wait_nop_ret, schedule()) /** * wait_event - sleep until a condition gets true |