Commit-ID: bc3eb7076b2b808f79abd4bd33b6a7feebb6f5d5 Gitweb: http://git.kernel.org/tip/bc3eb7076b2b808f79abd4bd33b6a7feebb6f5d5 Author: Andi Kleen <andi@xxxxxxxxxxxxxx> AuthorDate: Fri, 18 Sep 2009 07:49:25 +0200 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Fri, 18 Sep 2009 08:31:23 +0200 x86: Remove final bits of CONFIG_X86_OLD_MCE Caught by Linus. Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx> Cc: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx> Cc: Huang Ying <ying.huang@xxxxxxxxx> Cc: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> Cc: Borislav Petkov <borislav.petkov@xxxxxxx> [ fixed up context conflict manually. ] Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/power/cpu.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 417c9f5..8aa85f1 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html