diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:31 +0100 |
| commit | bed4f13065b520e564adffbfcd1c1a764a9c887e (patch) | |
| tree | d847ddd3bab64cb126ee6679dc4a949386554d55 /arch/x86/kernel/apic.c | |
| parent | 3e5621edb3392b28efb260ac99b2d26fb8b44e73 (diff) | |
| parent | bf8bd66d0580f296f257d371ee41a0a137b541c7 (diff) | |
Merge branch 'x86/irq' into x86/core
Diffstat (limited to 'arch/x86/kernel/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 20c6e12c047..7397911f847 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c @@ -777,11 +777,7 @@ static void local_apic_timer_interrupt(void) /* * the NMI deadlock-detector uses this. */ -#ifdef CONFIG_X86_64 - add_pda(apic_timer_irqs, 1); -#else - per_cpu(irq_stat, cpu).apic_timer_irqs++; -#endif + inc_irq_stat(apic_timer_irqs); evt->event_handler(evt); } @@ -1677,14 +1673,11 @@ void smp_spurious_interrupt(struct pt_regs *regs) if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f))) ack_APIC_irq(); -#ifdef CONFIG_X86_64 - add_pda(irq_spurious_count, 1); -#else + inc_irq_stat(irq_spurious_count); + /* see sw-dev-man vol 3, chapter 7.4.13.5 */ pr_info("spurious APIC interrupt on CPU#%d, " "should never happen.\n", smp_processor_id()); - __get_cpu_var(irq_stat).irq_spurious_count++; -#endif irq_exit(); } |