openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/mce/severity: Fix warning about indented braces 

Dan reported compiler warnings about missing curly braces in
mce_severity_amd(). Reindent the catch-all "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 this patch.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1427814281-18192-1-git-send-email-Aravind.Gopalakrishnan@amd.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Aravind Gopalakrishnan 2015-03-31 10:04:41 -05:00 committed by Ingo Molnar
parent f5c8a10411
commit cee8f5a6c8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kernel/cpu/mcheck/mce-severity.c
View File

@ -208,12 +208,11 @@ static int mce_severity_amd(struct mce *m, int tolerant, char **msg, bool is_exc
*/ */
if (mce_flags.overflow_recov) { if (mce_flags.overflow_recov) {
/* software can try to contain */ /* software can try to contain */
if (!(m->mcgstatus & MCG_STATUS_RIPV)) if (!(m->mcgstatus & MCG_STATUS_RIPV) && (ctx == IN_KERNEL))
if (ctx == IN_KERNEL) return MCE_PANIC_SEVERITY;
return MCE_PANIC_SEVERITY;
/* kill current process */ /* kill current process */
return MCE_AR_SEVERITY; return MCE_AR_SEVERITY;
} else { } else {
/* at least one error was not logged */ /* at least one error was not logged */
if (m->status & MCI_STATUS_OVER) if (m->status & MCI_STATUS_OVER)