Commit-ID: b2fbf6f282147b42d669a4bd4a7b1de2e2d6a792 Gitweb: https://git.kernel.org/tip/b2fbf6f282147b42d669a4bd4a7b1de2e2d6a792 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 21 Feb 2018 11:18:55 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 21 Feb 2018 17:00:53 +0100
x86/mce: Issue the 'mcelog --ascii' message only on !AMD mcelog cannot decode AMD MCEs. Signed-off-by: Borislav Petkov <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Tony Luck <[email protected]> Cc: linux-edac <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> --- arch/x86/kernel/cpu/mcheck/mce.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index db5b1e4..d7dff23 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -268,7 +268,9 @@ static void __print_mce(struct mce *m) static void print_mce(struct mce *m) { __print_mce(m); - pr_emerg_ratelimited(HW_ERR "Run the above through 'mcelog --ascii'\n"); + + if (m->cpuvendor != X86_VENDOR_AMD) + pr_emerg_ratelimited(HW_ERR "Run the above through 'mcelog --ascii'\n"); } #define PANIC_TIMEOUT 5 /* 5 seconds */
