Skip to content

Commit

Permalink
x86: apic_64.c - add sanity check for spurious vector definition
Browse files Browse the repository at this point in the history
Do not check for SPUTIOUS_APIC_VECTOR definition twice.
Check it once - is what we need.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Cyrill Gorcunov authored and Ingo Molnar committed Oct 16, 2008
1 parent 920fa7a commit 80e5609
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions arch/x86/kernel/apic_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 80e5609

Please sign in to comment.