Commit-ID: cf7361fd961b6f0510572af6cf8ca3ffba07018b Gitweb: http://git.kernel.org/tip/cf7361fd961b6f0510572af6cf8ca3ffba07018b Author: Peter Zijlstra <pet...@infradead.org> AuthorDate: Wed, 2 Oct 2013 11:22:31 +0200 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Fri, 4 Oct 2013 10:16:21 +0200
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 <o...@redhat.com> Signed-off-by: Peter Zijlstra <pet...@infradead.org> Link: http://lkml.kernel.org/r/20131002092528.898691...@infradead.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- include/linux/wait.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/include/linux/wait.h b/include/linux/wait.h index 5d5408b..ec3683e 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
