From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753969AbcBALlb (ORCPT ); Mon, 1 Feb 2016 06:41:31 -0500 Received: from terminus.zytor.com ([198.137.202.10]:57269 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753906AbcBALl1 (ORCPT ); Mon, 1 Feb 2016 06:41:27 -0500 Date: Mon, 1 Feb 2016 03:40:28 -0800 From: tip-bot for Aravind Gopalakrishnan Message-ID: Cc: tglx@linutronix.de, Aravind.Gopalakrishnan@amd.com, linux-edac@vger.kernel.org, bp@suse.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, bp@alien8.de, tony.luck@intel.com, peterz@infradead.org, mingo@kernel.org Reply-To: peterz@infradead.org, mingo@kernel.org, bp@alien8.de, tony.luck@intel.com, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, bp@suse.de, torvalds@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de, Aravind.Gopalakrishnan@amd.com In-Reply-To: <1453750913-4781-4-git-send-email-bp@alien8.de> References: <1453750913-4781-4-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce: Fix order of AMD MCE init function call Git-Commit-ID: bfbe0eeb769e2aff2cb1fc6845c4e4b7eac40bb3 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bfbe0eeb769e2aff2cb1fc6845c4e4b7eac40bb3 Gitweb: http://git.kernel.org/tip/bfbe0eeb769e2aff2cb1fc6845c4e4b7eac40bb3 Author: Aravind Gopalakrishnan AuthorDate: Mon, 25 Jan 2016 20:41:48 +0100 Committer: Ingo Molnar CommitDate: Mon, 1 Feb 2016 10:53:55 +0100 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 Signed-off-by: Borislav Petkov Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-edac Link: http://lkml.kernel.org/r/1453750913-4781-4-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/mcheck/mce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index a006f4c..b718080 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1617,10 +1617,10 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) case X86_VENDOR_AMD: { u32 ebx = cpuid_ebx(0x80000007); - mce_amd_feature_init(c); mce_flags.overflow_recov = !!(ebx & BIT(0)); mce_flags.succor = !!(ebx & BIT(1)); mce_flags.smca = !!(ebx & BIT(3)); + mce_amd_feature_init(c); break; }