Merge commit 'v2.6.29-rc1' into perfcounters/core

[karo-tx-linux.git] / arch / x86 / kernel / irq.c

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 3973e2df7f877c3a2fd7868691e3fd55214a178e..22f650db917fc2615f34741b11035bb74a6d5656 100644 (file)
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -57,6 +57,10 @@ static int show_other_interrupts(struct seq_file *p)
        for_each_online_cpu(j)
                seq_printf(p, "%10u ", irq_stats(j)->apic_timer_irqs);
        seq_printf(p, "  Local timer interrupts\n");
+       seq_printf(p, "CNT: ");
+       for_each_online_cpu(j)
+               seq_printf(p, "%10u ", irq_stats(j)->apic_perf_irqs);
+       seq_printf(p, "  Performance counter interrupts\n");
 #endif
 #ifdef CONFIG_SMP
        seq_printf(p, "RES: ");
@@ -164,6 +168,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
 
 #ifdef CONFIG_X86_LOCAL_APIC
        sum += irq_stats(cpu)->apic_timer_irqs;
+       sum += irq_stats(cpu)->apic_perf_irqs;
 #endif
 #ifdef CONFIG_SMP
        sum += irq_stats(cpu)->irq_resched_count;