Commit cee8f5a6 authored Mar 31, 2015 by Aravind Gopalakrishnan Committed by Ingo Molnar Apr 03, 2015

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>

parent f5c8a104

arch/x86/kernel/cpu/mcheck/mce-severity.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -208,8 +208,7 @@ 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)
		if (!(m->mcgstatus & MCG_STATUS_RIPV) && (ctx == IN_KERNEL))
		return MCE_PANIC_SEVERITY;

		/* kill current process */