>From c312848eb2574c54a3effb39f3287b3d2c464518 Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Fri, 15 Jan 2010 12:13:42 +0100 Subject: [PATCH 2/4] Drop check for removed config variable X86_MCE_P4THERMAL With the removal of the old MCE code in 5bb38adcb54cf7192b154368ad62982caa11ca0b the config Item X86_MCE_P4THERMAL was dropped from the kernel tree. However it was left as a alternative in one block which is now also dropped hereby Signed-off-by: Christoph Egger --- arch/x86/kernel/apic/apic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index e80f291..8566b97 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2075,7 +2075,7 @@ static int lapic_resume(struct sys_device *dev) apic_write(APIC_SPIV, apic_pm_state.apic_spiv); apic_write(APIC_LVT0, apic_pm_state.apic_lvt0); apic_write(APIC_LVT1, apic_pm_state.apic_lvt1); -#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL) +#if defined(CONFIG_X86_MCE_INTEL) if (maxlvt >= 5) apic_write(APIC_LVTTHMR, apic_pm_state.apic_thmr); #endif -- 1.6.3.3