From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754960AbcGHMH6 (ORCPT ); Fri, 8 Jul 2016 08:07:58 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52314 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754848AbcGHMHo (ORCPT ); Fri, 8 Jul 2016 08:07:44 -0400 Date: Fri, 8 Jul 2016 05:06:41 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: torvalds@linux-foundation.org, hpa@zytor.com, tony.luck@intel.com, bp@alien8.de, peterz@infradead.org, brgerst@gmail.com, tglx@linutronix.de, bp@suse.de, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, luto@kernel.org, jpoimboe@redhat.com, mingo@kernel.org Reply-To: dvlasenk@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jpoimboe@redhat.com, luto@kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, tglx@linutronix.de, bp@suse.de, brgerst@gmail.com, peterz@infradead.org, bp@alien8.de, tony.luck@intel.com In-Reply-To: <1467968983-4874-5-git-send-email-bp@alien8.de> References: <1467968983-4874-5-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce: Fix mce_rdmsrl() warning message Git-Commit-ID: 38c54ccb2ded3e93d8a353baeb7b9e12e1b77e23 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: 38c54ccb2ded3e93d8a353baeb7b9e12e1b77e23 Gitweb: http://git.kernel.org/tip/38c54ccb2ded3e93d8a353baeb7b9e12e1b77e23 Author: Borislav Petkov AuthorDate: Fri, 8 Jul 2016 11:09:41 +0200 Committer: Ingo Molnar CommitDate: Fri, 8 Jul 2016 11:29:26 +0200 x86/mce: Fix mce_rdmsrl() warning message The MSR address we're dumping in there should be in hex, otherwise we get funsies like: [ 0.016000] WARNING: CPU: 1 PID: 0 at arch/x86/kernel/cpu/mcheck/mce.c:428 mce_rdmsrl+0xd9/0xe0 [ 0.016000] mce: Unable to read msr -1073733631! ^^^^^^^^^^^ Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Link: http://lkml.kernel.org/r/1467968983-4874-5-git-send-email-bp@alien8.de [ Fixed capitalization of 'MSR'. ] 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 92e5e37..58af630 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -425,7 +425,7 @@ static u64 mce_rdmsrl(u32 msr) } if (rdmsrl_safe(msr, &v)) { - WARN_ONCE(1, "mce: Unable to read msr %d!\n", msr); + WARN_ONCE(1, "mce: Unable to read MSR 0x%x!\n", msr); /* * Return zero in case the access faulted. This should * not happen normally but can happen if the CPU does