From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757434AbcIMN2Z (ORCPT ); Tue, 13 Sep 2016 09:28:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39086 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756473AbcIMN2V (ORCPT ); Tue, 13 Sep 2016 09:28:21 -0400 Date: Tue, 13 Sep 2016 06:28:07 -0700 From: tip-bot for Yazen Ghannam Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, Yazen.Ghannam@amd.com, bp@suse.de Reply-To: hpa@zytor.com, mingo@kernel.org, bp@suse.de, Yazen.Ghannam@amd.com, linux-kernel@vger.kernel.org, tglx@linutronix.de In-Reply-To: <1468269447-8808-1-git-send-email-Yazen.Ghannam@amd.com> References: <1468269447-8808-1-git-send-email-Yazen.Ghannam@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce/AMD: Use msr_ops.misc() in allocate_threshold_blocks() Git-Commit-ID: 74ab0e7a836a7df772af50cac21267eb43688841 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: 74ab0e7a836a7df772af50cac21267eb43688841 Gitweb: http://git.kernel.org/tip/74ab0e7a836a7df772af50cac21267eb43688841 Author: Yazen Ghannam AuthorDate: Mon, 12 Sep 2016 09:59:27 +0200 Committer: Thomas Gleixner CommitDate: Tue, 13 Sep 2016 15:23:06 +0200 x86/mce/AMD: Use msr_ops.misc() in allocate_threshold_blocks() Change MSR_IA32_MCx_MISC() macro to msr_ops.misc() because SMCA machines define a different set of MSRs and msr_ops will give you the correct MISC register. Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Link: http://lkml.kernel.org/r/1468269447-8808-1-git-send-email-Yazen.Ghannam@amd.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 7b7f3be..78b7681 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -869,7 +869,7 @@ static int threshold_create_bank(unsigned int cpu, unsigned int bank) } } - err = allocate_threshold_blocks(cpu, bank, 0, MSR_IA32_MCx_MISC(bank)); + err = allocate_threshold_blocks(cpu, bank, 0, msr_ops.misc(bank)); if (!err) goto out;