Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71c69f7f authored by Paul Bolle's avatar Paul Bolle Committed by Ingo Molnar
Browse files

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: default avatarPaul Bolle <pebolle@tiscali.nl>
Link: http://lkml.kernel.org/r/1369853850.23034.28.camel@x61.thuisdomein


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent dcdbe33a

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -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