aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/irq.c
diff options
context:
space:
mode:
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>2009-06-02 03:53:23 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-06-03 17:48:59 -0400
commit8051dbd2dfd1427cc102888d7d96bf39de0be150 (patch)
tree1d3dee8f98ba0ac476920ec7ea0792ea9676ce6c /arch/x86/kernel/irq.c
parent9b1beaf2b551a8a1604f104025b24e9c535c8963 (diff)
x86, mce: fix for mce counters
Make the MCE counters work on 32bit and add poll count in arch_irq_stat_cpu. Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/irq.c')
-rw-r--r--arch/x86/kernel/irq.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index eff46b5de62f..9773395aa758 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -95,7 +95,7 @@ static int show_other_interrupts(struct seq_file *p, int prec)
95 seq_printf(p, " Threshold APIC interrupts\n"); 95 seq_printf(p, " Threshold APIC interrupts\n");
96# endif 96# endif
97#endif 97#endif
98#if defined(CONFIG_X86_MCE) && defined(CONFIG_X86_64) 98#ifdef CONFIG_X86_NEW_MCE
99 seq_printf(p, "%*s: ", prec, "MCE"); 99 seq_printf(p, "%*s: ", prec, "MCE");
100 for_each_online_cpu(j) 100 for_each_online_cpu(j)
101 seq_printf(p, "%10u ", per_cpu(mce_exception_count, j)); 101 seq_printf(p, "%10u ", per_cpu(mce_exception_count, j));
@@ -172,9 +172,6 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
172{ 172{
173 u64 sum = irq_stats(cpu)->__nmi_count; 173 u64 sum = irq_stats(cpu)->__nmi_count;
174 174
175#if defined(CONFIG_X86_MCE) && defined(CONFIG_X86_64)
176 sum += per_cpu(mce_exception_count, cpu);
177#endif
178#ifdef CONFIG_X86_LOCAL_APIC 175#ifdef CONFIG_X86_LOCAL_APIC
179 sum += irq_stats(cpu)->apic_timer_irqs; 176 sum += irq_stats(cpu)->apic_timer_irqs;
180 sum += irq_stats(cpu)->irq_spurious_count; 177 sum += irq_stats(cpu)->irq_spurious_count;
@@ -192,6 +189,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
192 sum += irq_stats(cpu)->irq_threshold_count; 189 sum += irq_stats(cpu)->irq_threshold_count;
193# endif 190# endif
194#endif 191#endif
192#ifdef CONFIG_X86_NEW_MCE
193 sum += per_cpu(mce_exception_count, cpu);
194 sum += per_cpu(mce_poll_count, cpu);
195#endif
195 return sum; 196 return sum;
196} 197}
197 198