From: "Paul E. McKenney" <paulmck@kernel.org>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Davidlohr Bueso <dave@stgolabs.net>,
Josh Triplett <josh@joshtriplett.org>
Subject: Re: [PATCH] locktorture.c: fix if-statement empty body warnings
Date: Thu, 27 Feb 2020 06:53:00 -0800 [thread overview]
Message-ID: <20200227145300.GG2935@paulmck-ThinkPad-P72> (raw)
In-Reply-To: <06d89556-777e-ba59-1d55-12f11cba9668@infradead.org>
On Tue, Feb 25, 2020 at 09:09:19PM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
>
> When using -Wextra, gcc complains about torture_preempt_schedule()
> when its definition is empty (i.e., when CONFIG_PREEMPTION is not
> set/enabled). Fix these warnings by adding an empty do-while block
> for that macro when CONFIG_PREEMPTION is not set.
> Fixes these build warnings:
>
> ../kernel/locking/locktorture.c:119:29: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
> ../kernel/locking/locktorture.c:166:29: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
> ../kernel/locking/locktorture.c:337:29: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
> ../kernel/locking/locktorture.c:490:29: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
> ../kernel/locking/locktorture.c:528:29: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
> ../kernel/locking/locktorture.c:553:29: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
>
> I have verified that there is no object code change (with gcc 7.5.0).
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Queued for v5.8, thank you very much!
Thanx, Paul
> Cc: Davidlohr Bueso <dave@stgolabs.net>
> Cc: "Paul E. McKenney" <paulmck@kernel.org>
> Cc: Josh Triplett <josh@joshtriplett.org>
> ---
> include/linux/torture.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-next-20200225.orig/include/linux/torture.h
> +++ linux-next-20200225/include/linux/torture.h
> @@ -89,7 +89,7 @@ void _torture_stop_kthread(char *m, stru
> #ifdef CONFIG_PREEMPTION
> #define torture_preempt_schedule() preempt_schedule()
> #else
> -#define torture_preempt_schedule()
> +#define torture_preempt_schedule() do { } while (0)
> #endif
>
> #endif /* __LINUX_TORTURE_H */
>
prev parent reply other threads:[~2020-02-27 14:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 5:09 [PATCH] locktorture.c: fix if-statement empty body warnings Randy Dunlap
2020-02-27 14:53 ` Paul E. McKenney [this message]
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=20200227145300.GG2935@paulmck-ThinkPad-P72 \
--to=paulmck@kernel.org \
--cc=dave@stgolabs.net \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).