Commit 5ca8681c authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, mce, cmci: disable CMCI on rebooting 



Impact: Avoids confusing other OSes.

Disable the CMCI vector on reboot to avoid confusing other OS.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent df20e2eb

arch/x86/kernel/apic.c

+8 −0
Original line number Diff line number Diff line
@@ -868,6 +868,14 @@ void clear_local_APIC(void) 
		apic_write(APIC_LVTTHMR, v | APIC_LVT_MASKED);

	}

#endif

#ifdef CONFIG_X86_MCE_INTEL

	if (maxlvt >= 6) {

		v = apic_read(APIC_LVTCMCI);

		if (!(v & APIC_LVT_MASKED))

			apic_write(APIC_LVTCMCI, v | APIC_LVT_MASKED);

	}

#endif



	/*

	 * Clean APIC state for other OSs:

	 */