Messages in this thread Patch in this message | | | Date | Fri, 12 Dec 2008 19:08:27 +0100 | From | Andreas Herrmann <> | Subject | [PATCH 1/2] x86: don't enable MCE after suspend/resume when system was booted with "nomce" |
| |
Impact: fix suspend/resume bug with MCE
A suspend/resume cycle unconditionally enables MCE for the boot CPU if MCE is compiled into the kernel. I.e. even a system booted with "nomce" configures MCE for the boot CPU.
This patch ensures that MCE is not turned on for systems booted with "nomce".
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com> --- arch/x86/kernel/cpu/mcheck/mce_64.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index 4b031a4..e2d9649 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c @@ -443,6 +443,9 @@ static void mce_init(void *dummy) u64 cap; int i; + if (mce_dont_init) + return; + rdmsrl(MSR_IA32_MCG_CAP, cap); banks = cap & 0xff; if (banks > MCE_EXTENDED_BANK) { -- 1.6.0.4
| |