summaryrefslogtreecommitdiff
path: root/include/linux/wait.h
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2013-10-02 13:22:31 +0400
committerIngo Molnar <mingo@kernel.org>2013-10-04 12:16:21 +0400
commitcf7361fd961b6f0510572af6cf8ca3ffba07018b (patch)
tree1960211699f1e7e66bf4909cf26248b31ef54ac6 /include/linux/wait.h
parent0d1e1c8a430450a3ce61a842cec64f9e2a9f3b05 (diff)
downloadlinux-cf7361fd961b6f0510572af6cf8ca3ffba07018b.tar.xz
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: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20131002092528.898691966@infradead.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/wait.h')
-rw-r--r--include/linux/wait.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 5d5408b08ba5..ec3683ee0fc2 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -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