[PATCH 02/19] swait: Parameterize the return variable to __swait_event_timeout()

[Matthew Wilcox (Oracle)]

Macros should not refer to variables which aren't in their arguments.
Pass the name from its caller.

Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
---
 include/linux/swait.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/swait.h b/include/linux/swait.h
index 5e8e9b13be2d..0ca80e31776f 100644
--- a/include/linux/swait.h
+++ b/include/linux/swait.h
@@ -190,7 +190,7 @@ do {									\
 	__swait_event(wq, condition);					\
 } while (0)
 
-#define __swait_event_timeout(wq, condition, timeout)			\
+#define __swait_event_timeout(wq, condition, timeout, __ret)		\
 	___swait_event(wq, ___wait_cond_timeout(condition, __ret),	\
 		      TASK_UNINTERRUPTIBLE, timeout,			\
 		      __ret = schedule_timeout(__ret))
@@ -199,7 +199,7 @@ do {									\
 ({									\
 	long __ret = timeout;						\
 	if (!___wait_cond_timeout(condition, __ret))			\
-		__ret = __swait_event_timeout(wq, condition, timeout);	\
+		__ret = __swait_event_timeout(wq, condition, timeout, __ret); \
 	__ret;								\
 })
 
-- 
2.34.1