diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-18 18:45:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-19 02:07:17 +0200 |
| commit | 0b23e8cf553f5e706b0057363f1319867bcd1a7d (patch) | |
| tree | a9d1116c7c59d81cbc0d88d47366802cbb70201a | |
| parent | x86: apic - unify end_local_APIC_setup (diff) | |
| download | linux-0b23e8cf553f5e706b0057363f1319867bcd1a7d.tar.xz linux-0b23e8cf553f5e706b0057363f1319867bcd1a7d.zip | |
x86: apic - unify local_apic_timer_interrupt
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/apic_32.c | 4 | ||||
| -rw-r--r-- | 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 f1882329b9cf..af227bce23b1 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 eec10b34dc49..a9ad2cb4ff95 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); } |