diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2013-10-02 11:22:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-04 10:14:48 +0200 |
| commit | f13f4c41c9cf9cd61c896e46e4e7ba2687e2af9c (patch) | |
| tree | 7eb3139fbc026887c39b1b52252cfa50ad5d9b8a /include/linux/wait.h | |
| parent | ddc1994b8217527e1818f690f17597fc9cedf81b (diff) | |
| download | lwn-f13f4c41c9cf9cd61c896e46e4e7ba2687e2af9c.tar.gz lwn-f13f4c41c9cf9cd61c896e46e4e7ba2687e2af9c.zip | |
sched/wait: Collapse __wait_event_interruptible()
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.396949919@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/wait.h')
| -rw-r--r-- | include/linux/wait.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index 546b94efc82e..39e4bbd2c735 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -277,21 +277,8 @@ do { \ }) #define __wait_event_interruptible(wq, condition, ret) \ -do { \ - DEFINE_WAIT(__wait); \ - \ - for (;;) { \ - prepare_to_wait(&wq, &__wait, TASK_INTERRUPTIBLE); \ - if (condition) \ - break; \ - if (signal_pending(current)) { \ - ret = -ERESTARTSYS; \ - break; \ - } \ - schedule(); \ - } \ - finish_wait(&wq, &__wait); \ -} while (0) + ___wait_event(wq, condition, TASK_INTERRUPTIBLE, 0, ret, \ + schedule()) /** * wait_event_interruptible - sleep until a condition gets true |