Commit bfbe0eeb authored Jan 25, 2016 by Aravind Gopalakrishnan Committed by Ingo Molnar Feb 01, 2016

x86/mce: Fix order of AMD MCE init function call



In mce_amd_feature_init() we take decisions based on mce_flags
being set or not. So the feature detection using CPUID should
naturally be ordered before we call mce_amd_feature_init().

Fix that here.

Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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/1453750913-4781-4-git-send-email-bp@alien8.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 36f90b0a

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1617,10 +1617,10 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
	case X86_VENDOR_AMD: {		case X86_VENDOR_AMD: {
	u32 ebx = cpuid_ebx(0x80000007);		u32 ebx = cpuid_ebx(0x80000007);

	mce_amd_feature_init(c);
	mce_flags.overflow_recov = !!(ebx & BIT(0));		mce_flags.overflow_recov = !!(ebx & BIT(0));
	mce_flags.succor = !!(ebx & BIT(1));		mce_flags.succor = !!(ebx & BIT(1));
	mce_flags.smca = !!(ebx & BIT(3));		mce_flags.smca = !!(ebx & BIT(3));
			mce_amd_feature_init(c);

	break;		break;
	}		}