commit 0b23e8cf553f5e706b0057363f1319867bcd1a7d
author Cyrill Gorcunov <gorcunov@gmail.com> Mon Aug 18 20:45:59 2008 +0400
committer Ingo Molnar <mingo@elte.hu> Tue Aug 19 02:07:17 2008 +0200
tree a9d1116c7c59d81cbc0d88d47366802cbb70201a
parent fa6b95fc7c6f2f3eb1560e1f33cd13197546c5a0

x86: apic - unify local_apic_timer_interrupt

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/kernel/apic_32.c

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index f188232..af227bc 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -685,7 +685,11 @@
 	/*
 	 * 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
 
 	evt->event_handler(evt);
 }

arch/x86/kernel/apic_64.c

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index eec10b3..a9ad2cb 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -567,7 +567,11 @@
 	/*
 	 * 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
 
 	evt->event_handler(evt);
 }