From: Andi Kleen <andi@firstfloor.org>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Borislav Petkov <borislav.petkov@amd.com>, torvalds@osdl.org
Subject: x86: mce: Please revert 22223c9b417be5fd0ab2cf9ad17eb7bd1e19f7b9
Date: Wed, 30 Sep 2009 16:09:04 +0200 [thread overview]
Message-ID: <20090930140904.GA6150@one.firstfloor.org> (raw)
Can someone please revert this incorrect commit that's in mainline
now?
Obviously kernels compiled with AMD support can still run on non
AMD systems, so messages like this can never be removed at compile time.
-andi
Commit 22223c9b417be5fd0ab2cf9ad17eb7bd1e19f7b9
Author: Borislav Petkov <borislav.petkov@amd.com>
Date: Tue Jul 28 14:47:10 2009 +0200
x86, mce: do not compile mcelog message on AMD
Now that decoding is done in-kernel, suppress mcelog message part.
CC: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index b82866f..9bfe9d2 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -222,7 +222,10 @@ static void print_mce_head(void)
static void print_mce_tail(void)
{
printk(KERN_EMERG "This is not a software problem!\n"
- "Run through mcelog --ascii to decode and contact your hardware vendor\n");
+#if (!defined(CONFIG_EDAC) || !defined(CONFIG_CPU_SUP_AMD))
+ "Run through mcelog --ascii to decode and contact your hardware vendor\n"
+#endif
+ );
}
#define PANIC_TIMEOUT 5 /* 5 seconds */
--
ak@linux.intel.com -- Speaking for myself only.
next reply other threads:[~2009-09-30 14:09 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-30 14:09 Andi Kleen [this message]
2009-09-30 19:40 ` x86: mce: Please revert 22223c9b417be5fd0ab2cf9ad17eb7bd1e19f7b9 Borislav Petkov
2009-09-30 20:46 ` Ingo Molnar
2009-09-30 21:48 ` Ingo Molnar
2009-09-30 22:39 ` Borislav Petkov
2009-09-30 23:09 ` Ingo Molnar
2009-10-01 14:14 ` Borislav Petkov
2009-10-01 14:34 ` Linus Torvalds
2009-10-01 14:46 ` Borislav Petkov
2009-10-01 15:00 ` Ingo Molnar
2009-10-01 15:21 ` Borislav Petkov
2009-10-01 15:32 ` Ingo Molnar
2009-10-02 13:21 ` Borislav Petkov
2009-10-02 13:22 ` [PATCH 1/3] x86, mce, edac: Fix MCE decoding callback logic Borislav Petkov
2009-10-02 13:23 ` [PATCH 2/3] initcalls: add early_initcall for modules Borislav Petkov
2009-10-02 14:01 ` [tip:x86/urgent] initcalls: Add early_initcall() " tip-bot for Borislav Petkov
2009-10-02 13:26 ` x86: mce: Please revert 22223c9b417be5fd0ab2cf9ad17eb7bd1e19f7b9 Ingo Molnar
2009-10-02 13:31 ` [PATCH 3/3] EDAC: carve out AMD MCE decoding logic Borislav Petkov
2009-10-02 13:39 ` Ingo Molnar
2009-10-02 18:26 ` Borislav Petkov
2009-10-02 18:47 ` Ingo Molnar
2009-10-03 6:57 ` Borislav Petkov
2009-10-03 7:18 ` Ingo Molnar
2009-10-05 15:15 ` Borislav Petkov
2009-10-16 12:55 ` [tip:perf/mce] mce, edac: Use an atomic notifier for MCEs decoding tip-bot for Borislav Petkov
2009-10-02 14:01 ` [tip:x86/urgent] x86: EDAC: carve out AMD MCE decoding logic tip-bot for Borislav Petkov
2009-10-01 14:55 ` x86: mce: Please revert 22223c9b417be5fd0ab2cf9ad17eb7bd1e19f7b9 Ingo Molnar
2009-10-01 15:26 ` Andi Kleen
2009-10-02 14:01 ` [tip:x86/urgent] x86: EDAC: MCE: Fix MCE decoding callback logic tip-bot for Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090930140904.GA6150@one.firstfloor.org \
--to=andi@firstfloor.org \
--cc=borislav.petkov@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox