diff options
| author | Brian Gerst <brgerst@gmail.com> | 2009-01-18 16:38:57 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-01-18 16:38:57 +0100 |
| commit | 1b437c8c73a36daa471dd54a63c426d72af5723d (patch) | |
| tree | 2b713669c050fe52610959a7d68b53a2da75181d /arch/x86/kernel/nmi.c | |
| parent | linker script: add missing .data.percpu.page_aligned (diff) | |
| download | linux-1b437c8c73a36daa471dd54a63c426d72af5723d.tar.xz linux-1b437c8c73a36daa471dd54a63c426d72af5723d.zip | |
x86-64: Move irq stats from PDA to per-cpu and consolidate with 32-bit.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/kernel/nmi.c')
| -rw-r--r-- | arch/x86/kernel/nmi.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 7228979f1e7f..23b6d9e6e4f5 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -61,11 +61,7 @@ static int endflag __initdata; static inline unsigned int get_nmi_count(int cpu) { -#ifdef CONFIG_X86_64 - return cpu_pda(cpu)->__nmi_count; -#else - return nmi_count(cpu); -#endif + return per_cpu(irq_stat, cpu).__nmi_count; } static inline int mce_in_progress(void) @@ -82,12 +78,8 @@ static inline int mce_in_progress(void) */ static inline unsigned int get_timer_irqs(int cpu) { -#ifdef CONFIG_X86_64 - return read_pda(apic_timer_irqs) + read_pda(irq0_irqs); -#else return per_cpu(irq_stat, cpu).apic_timer_irqs + per_cpu(irq_stat, cpu).irq0_irqs; -#endif } #ifdef CONFIG_SMP |