diff options
| author | Paul Bolle | 2013-05-29 20:57:30 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-05-31 13:12:35 +0200 |
| commit | 71c69f7f4b67150e10cdfcad217d464f1821b3c6 (patch) | |
| tree | 1ff64ff98df2156ec37420d380963e2093c27987 /arch/x86/kernel/apic/apic.c | |
| parent | Merge branch 'mn10300' (mn10300 fixes from David Howells) (diff) | |
| download | kernel-qcow2-linux-71c69f7f4b67150e10cdfcad217d464f1821b3c6.tar.gz kernel-qcow2-linux-71c69f7f4b67150e10cdfcad217d464f1821b3c6.tar.xz kernel-qcow2-linux-71c69f7f4b67150e10cdfcad217d464f1821b3c6.zip | |
x86/mce: Remove check for CONFIG_X86_MCE_P4THERMAL
The Kconfig symbol X86_MCE_P4THERMAL was removed in v2.6.32.
Remove a useless check for its macro, as it will now always
evaluate to false.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Link: http://lkml.kernel.org/r/1369853850.23034.28.camel@x61.thuisdomein
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | 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 904611bf0e5a..1600b1ca4f04 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2302,7 +2302,7 @@ static void lapic_resume(void) 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 |