From: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
To: <tglx@linutronix.de>, <mingo@redhat.com>, <hpa@zytor.com>,
<tony.luck@intel.com>, <bp@alien8.de>, <x86@kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-edac@vger.kernel.org>
Cc: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Subject: [PATCH] x86, mce, severity: Fix warning about intended braces
Date: Tue, 31 Mar 2015 10:04:41 -0500 [thread overview]
Message-ID: <1427814281-18192-1-git-send-email-Aravind.Gopalakrishnan@amd.com> (raw)
Dan reported compiler warnings about intended curly braces
around if (!(m->mcgstatus & MCG_STATUS_RIPV)).
This can be fixed by reindenting return MCE_AR_SEVERITY
correctly to single tab.
While at it, chain ctx == IN_KERNEL check with mcgstatus
check to make it cleaner as suggested by Boris.
No functional changes are introduced by the patch
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
---
arch/x86/kernel/cpu/mcheck/mce-severity.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce-severity.c b/arch/x86/kernel/cpu/mcheck/mce-severity.c
index 155c926..8329c6b 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-severity.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c
@@ -208,12 +208,12 @@ static int mce_severity_amd(struct mce *m, int tolerant, char **msg, bool is_exc
*/
if (mce_flags.overflow_recov) {
/* software can try to contain */
- if (!(m->mcgstatus & MCG_STATUS_RIPV))
- if (ctx == IN_KERNEL)
- return MCE_PANIC_SEVERITY;
+ if (!(m->mcgstatus & MCG_STATUS_RIPV) &&
+ ctx == IN_KERNEL)
+ return MCE_PANIC_SEVERITY;
- /* kill current process */
- return MCE_AR_SEVERITY;
+ /* kill current process */
+ return MCE_AR_SEVERITY;
} else {
/* at least one error was not logged */
if (m->status & MCI_STATUS_OVER)
--
1.9.1
next reply other threads:[~2015-03-31 20:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-31 15:04 Aravind Gopalakrishnan [this message]
2015-04-01 12:26 ` Borislav Petkov
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=1427814281-18192-1-git-send-email-Aravind.Gopalakrishnan@amd.com \
--to=aravind.gopalakrishnan@amd.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®