From: Ingo Molnar Date: Wed, 29 Apr 2009 12:46:59 +0000 (+0200) Subject: Merge branch 'linus' into perfcounters/core X-Git-Tag: v2.6.31-rc1~383^2~355 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a;p=cascardo%2Flinux.git Merge branch 'linus' into perfcounters/core Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up the latest upstream fixes. Signed-off-by: Ingo Molnar --- e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a diff --cc MAINTAINERS index 16fb45adb53e,c547f4a2bb62..5114b5341df4 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -3482,17 -4372,9 +4372,19 @@@ P: Balbir Sing M: balbir@linux.vnet.ibm.com L: linux-kernel@vger.kernel.org S: Maintained + F: include/linux/delayacct.h + F: kernel/delayacct.c +PERFORMANCE COUNTER SUBSYSTEM +P: Peter Zijlstra +M: a.p.zijlstra@chello.nl +P: Paul Mackerras +M: paulus@samba.org +P: Ingo Molnar +M: mingo@elte.hu +L: linux-kernel@vger.kernel.org +S: Supported + PERSONALITY HANDLING P: Christoph Hellwig M: hch@infradead.org diff --cc arch/x86/kernel/irq.c index 849cfabb1fdc,c3fe010d74c8..8279fb8df17f --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@@ -63,17 -63,9 +63,17 @@@ static int show_other_interrupts(struc for_each_online_cpu(j) seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count); seq_printf(p, " Spurious interrupts\n"); + seq_printf(p, "%*s: ", prec, "CNT"); + for_each_online_cpu(j) + seq_printf(p, "%10u ", irq_stats(j)->apic_perf_irqs); + seq_printf(p, " Performance counter interrupts\n"); + seq_printf(p, "%*s: ", prec, "PND"); + for_each_online_cpu(j) + seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs); + seq_printf(p, " Performance pending work\n"); #endif if (generic_interrupt_extension) { - seq_printf(p, "PLT: "); + seq_printf(p, "%*s: ", prec, "PLT"); for_each_online_cpu(j) seq_printf(p, "%10u ", irq_stats(j)->generic_irqs); seq_printf(p, " Platform interrupts\n");