All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Kees Cook <keescook@chromium.org>, Ingo Molnar <mingo@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Juri Lelli <juri.lelli@redhat.com>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	Dietmar Eggemann <dietmar.eggemann@arm.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>,
	Daniel Bristot de Oliveira <bristot@redhat.com>,
	Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 04/19] swait: Parameterize the return variable to __swait_event_idle_timeout()
Date: Wed,  2 Mar 2022 04:34:36 +0000	[thread overview]
Message-ID: <20220302043451.2441320-5-willy@infradead.org> (raw)
In-Reply-To: <20220302043451.2441320-1-willy@infradead.org>

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@infradead.org>
---
 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 4147be3a0014..1bc42967182a 100644
--- a/include/linux/swait.h
+++ b/include/linux/swait.h
@@ -251,7 +251,7 @@ do {									\
 	__swait_event_idle(wq, condition);				\
 } while (0)
 
-#define __swait_event_idle_timeout(wq, condition, timeout)		\
+#define __swait_event_idle_timeout(wq, condition, timeout, __ret)	\
 	___swait_event(wq, ___wait_cond_timeout(condition, __ret),	\
 		       TASK_IDLE, timeout,				\
 		       __ret = schedule_timeout(__ret))
@@ -280,7 +280,7 @@ do {									\
 	long __ret = timeout;						\
 	if (!___wait_cond_timeout(condition, __ret))			\
 		__ret = __swait_event_idle_timeout(wq,			\
-						   condition, timeout);	\
+					   condition, timeout, __ret);	\
 	__ret;								\
 })
 
-- 
2.34.1


  parent reply	other threads:[~2022-03-02  4:35 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-02  4:34 [PATCH 00/19] Enable -Wshadow=local for kernel/sched Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 01/19] wait: Parameterize the return variable to ___wait_event() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 02/19] swait: Parameterize the return variable to __swait_event_timeout() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 03/19] swait: Parameterize the return variable to __swait_event_interruptible_timeout() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` Matthew Wilcox (Oracle) [this message]
2022-03-02  4:34 ` [PATCH 05/19] wait: Parameterize the return variable to __wait_event_timeout() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 06/19] wait: Parameterize the return variable to __wait_event_freezable_timeout() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 07/19] wait: Parameterize the return variable to __wait_event_interruptible_timeout() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 08/19] wait: Parameterize the return variable to __wait_event_idle_timeout() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 09/19] wait: Parameterize the return variable to __wait_event_idle_exclusive_timeout() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 10/19] wait: Parameterize the return variable to __wait_event_killable_timeout() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 11/19] wait: Parameterize the return variable to __wait_event_lock_irq_timeout() Matthew Wilcox (Oracle)
2022-03-02  4:34 ` [PATCH 12/19] wait_bit: Parameterize the return variable to __wait_var_event_timeout() Matthew Wilcox (Oracle)
2022-03-02 18:32 ` [PATCH 00/19] Enable -Wshadow=local for kernel/sched Kees Cook
2022-03-02 18:43   ` Matthew Wilcox
2022-03-02 19:18     ` Peter Zijlstra
2024-04-16 21:15 ` Kees Cook
2024-04-17  0:29   ` Linus Torvalds
2024-04-17  0:50     ` Linus Torvalds
2024-04-17  0:52     ` Matthew Wilcox
2024-04-17 11:23       ` Ingo Molnar
2024-04-19 22:06       ` Kees Cook

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220302043451.2441320-5-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=bristot@redhat.com \
    --cc=bsegall@google.com \
    --cc=dietmar.eggemann@arm.com \
    --cc=juri.lelli@redhat.com \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mgorman@suse.de \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=torvalds@linux-foundation.org \
    --cc=vincent.guittot@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.