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

Commit 80e5609c authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: apic_64.c - add sanity check for spurious vector definition 



Do not check for SPUTIOUS_APIC_VECTOR definition twice.
Check it once - is what we need.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 920fa7a5

arch/x86/kernel/apic_64.c

+7 −2
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ 
#include <mach_ipi.h>

#include <mach_apic.h>



/*

 * Sanity check

 */

#if ((SPURIOUS_APIC_VECTOR & 0x0F) != 0x0F)

# error SPURIOUS_APIC_VECTOR definition error

#endif



/* Disable local APIC timer from the kernel commandline or via dmi quirk */

static int disable_apic_timer __cpuinitdata;

static int apic_calibrate_pmtmr __initdata;
@@ -939,8 +946,6 @@ void __cpuinit setup_local_APIC(void) 
	preempt_disable();

	value = apic_read(APIC_LVR);



	BUILD_BUG_ON((SPURIOUS_APIC_VECTOR & 0x0f) != 0x0f);



	/*

	 * Double-check whether this APIC is really registered.

	 * This is meaningless in clustered apic mode, so we skip it.