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

Commit 07db1c14 authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, mce: fix ifdef for 64bit thermal apic vector clear on shutdown 



Impact: Bugfix

The ifdef for the apic clear on shutdown for the 64bit intel thermal
vector was incorrect and never triggered. Fix that.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 380851bc

arch/x86/kernel/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ void clear_local_APIC(void) 
	}



	/* lets not touch this if we didn't frob it */

#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(X86_MCE_INTEL)

#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)

	if (maxlvt >= 5) {

		v = apic_read(APIC_LVTTHMR);

		apic_write(APIC_LVTTHMR, v | APIC_LVT_MASKED);