From d0cf29fdc76991308cfd96bfda843319ac60c211 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Mon, 18 Aug 2008 20:45:59 +0400 Subject: [PATCH] --- yaml --- r: 112733 b: refs/heads/master c: 0b23e8cf553f5e706b0057363f1319867bcd1a7d h: refs/heads/master i: 112731: 9823facd3bf05863ba5a642f9d31a5a1772c7f3e v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic_32.c | 4 ++++ trunk/arch/x86/kernel/apic_64.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 683b413cde12..bd0a8f7ef039 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa6b95fc7c6f2f3eb1560e1f33cd13197546c5a0 +refs/heads/master: 0b23e8cf553f5e706b0057363f1319867bcd1a7d diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c index f1882329b9cf..af227bce23b1 100644 --- a/trunk/arch/x86/kernel/apic_32.c +++ b/trunk/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/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c index eec10b34dc49..a9ad2cb4ff95 100644 --- a/trunk/arch/x86/kernel/apic_64.c +++ b/trunk/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); }