aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
-rw-r--r--arch/x86/kernel/apic_64.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 9b4cacdfd74f..8b0fad47a5d2 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -738,6 +738,7 @@ void __cpuinit setup_local_APIC(void)
738 unsigned int value; 738 unsigned int value;
739 int i, j; 739 int i, j;
740 740
741 preempt_disable();
741 value = apic_read(APIC_LVR); 742 value = apic_read(APIC_LVR);
742 743
743 BUILD_BUG_ON((SPURIOUS_APIC_VECTOR & 0x0f) != 0x0f); 744 BUILD_BUG_ON((SPURIOUS_APIC_VECTOR & 0x0f) != 0x0f);
@@ -831,6 +832,7 @@ void __cpuinit setup_local_APIC(void)
831 else 832 else
832 value = APIC_DM_NMI | APIC_LVT_MASKED; 833 value = APIC_DM_NMI | APIC_LVT_MASKED;
833 apic_write(APIC_LVT1, value); 834 apic_write(APIC_LVT1, value);
835 preempt_enable();
834} 836}
835 837
836void __cpuinit lapic_setup_esr(void) 838void __cpuinit lapic_setup_esr(void)