From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 2 Oct 2013 09:22:24 +0000 (+0200)
Subject: sched/wait: Collapse __wait_event_interruptible()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f13f4c41c9cf9cd61c896e46e4e7ba2687e2af9c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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