From: Andi Kleen Date: Fri, 18 Sep 2009 05:49:25 +0000 (+0200) Subject: x86: Remove final bits of CONFIG_X86_OLD_MCE X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bc3eb7076b2b808f79abd4bd33b6a7feebb6f5d5;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git x86: Remove final bits of CONFIG_X86_OLD_MCE Caught by Linus. Reported-by: Linus Torvalds Signed-off-by: Andi Kleen Cc: Hidetoshi Seto Cc: Huang Ying Cc: Bartlomiej Zolnierkiewicz Cc: Borislav Petkov [ fixed up context conflict manually. ] Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 417c9f5b4af..8aa85f17667 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c @@ -243,10 +243,6 @@ static void __restore_processor_state(struct saved_context *ctxt) do_fpu_end(); mtrr_bp_restore(); - -#ifdef CONFIG_X86_OLD_MCE - mcheck_init(&boot_cpu_data); -#endif } /* Needed by apm.c */