[PATCH 11/15] x86: apic - unify local_apic_timer_interrupt

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Cyrill Gorcunov
Date: Monday, August 18, 2008 - 9:45 am

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 arch/x86/kernel/apic_32.c |    4 ++++
 arch/x86/kernel/apic_64.c |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

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 @@ 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
 
 	evt->event_handler(evt);
 }
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 @@ 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
 
 	evt->event_handler(evt);
 }
-- 
1.6.0.rc1.34.g0fe8c

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/15] apic: unification series 5, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 01/15] x86: apic - rearrange maxcpu definition, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 02/15] x86: apic - unify setup_boot_APIC_clock, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 03/15] x86: apic - unify disable_local_APIC, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 04/15] x86: apic - unify lapic_shutdown, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 05/15] x86: apic - unify connect_bsp_APIC, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 06/15] x86: apic - unify lapic_setup_esr, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 07/15] x86: apic - unify __setup_APIC_LVTT, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 08/15] x86: apic - unify disconnect_bsp_APIC, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 09/15] x86: apic - generic_processor_info, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 10/15] x86: apic - unify end_local_APIC_setup, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 11/15] x86: apic - unify local_apic_timer_interrupt, Cyrill Gorcunov, (Mon Aug 18, 9:45 am)
[PATCH 12/15] x86: apic - unify apic_set_verbosity, Cyrill Gorcunov, (Mon Aug 18, 9:46 am)
[PATCH 14/15] x86: apic - rearrange parse_lapic_timer_c2_ok, Cyrill Gorcunov, (Mon Aug 18, 9:46 am)
Re: [PATCH 01/15] x86: apic - rearrange maxcpu definition, Cyrill Gorcunov, (Mon Aug 18, 9:59 am)
Re: [PATCH 0/15] apic: unification series 5, H. Peter Anvin, (Mon Aug 18, 10:22 am)
Re: [PATCH 0/15] apic: unification series 5, Cyrill Gorcunov, (Mon Aug 18, 10:28 am)
Re: [PATCH 0/15] apic: unification series 5, Cyrill Gorcunov, (Mon Aug 18, 12:12 pm)
Re: [PATCH 0/15] apic: unification series 5, Ingo Molnar, (Mon Aug 18, 5:09 pm)