aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/apic.c')
-rw-r--r--arch/x86/kernel/apic.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index fc26ff390f1..47cbaa237b7 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -777,11 +777,7 @@ static void local_apic_timer_interrupt(void)
777 /* 777 /*
778 * the NMI deadlock-detector uses this. 778 * the NMI deadlock-detector uses this.
779 */ 779 */
780#ifdef CONFIG_X86_64 780 inc_irq_stat(apic_timer_irqs);
781 add_pda(apic_timer_irqs, 1);
782#else
783 per_cpu(irq_stat, cpu).apic_timer_irqs++;
784#endif
785 781
786 evt->event_handler(evt); 782 evt->event_handler(evt);
787} 783}
@@ -1681,14 +1677,11 @@ void smp_spurious_interrupt(struct pt_regs *regs)
1681 if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f))) 1677 if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f)))
1682 ack_APIC_irq(); 1678 ack_APIC_irq();
1683 1679
1684#ifdef CONFIG_X86_64 1680 inc_irq_stat(irq_spurious_count);
1685 add_pda(irq_spurious_count, 1); 1681
1686#else
1687 /* see sw-dev-man vol 3, chapter 7.4.13.5 */ 1682 /* see sw-dev-man vol 3, chapter 7.4.13.5 */
1688 pr_info("spurious APIC interrupt on CPU#%d, " 1683 pr_info("spurious APIC interrupt on CPU#%d, "
1689 "should never happen.\n", smp_processor_id()); 1684 "should never happen.\n", smp_processor_id());
1690 __get_cpu_var(irq_stat).irq_spurious_count++;
1691#endif
1692 irq_exit(); 1685 irq_exit();
1693} 1686}
1694 1687