The following commit has been merged in the linux branch: commit 89ccf465abe6b20d804a63ae20307970c441369d Author: Li Hong lihong.hi@gmail.com Date: Wed Oct 14 18:50:39 2009 +0800

x86, perf_event: Rename 'performance counter interrupt'

In 'cdd6c482c9ff9c55475ee7392ec8f672eddb7be6', we renamed Performance Counters -> Performance Events.

The name showed up in /proc/interrupts also needs a change. I use PMI (Performance monitoring interrupt) here, since it is the official name used in Intel's documents.

Signed-off-by: Li Hong lihong.hi@gmail.com Cc: Andrew Morton akpm@linux-foundation.org Cc: Peter Zijlstra a.p.zijlstra@chello.nl Cc: Paul Mackerras paulus@samba.org LKML-Reference: 20091014105039.GA22670@uhli Signed-off-by: Ingo Molnar mingo@elte.hu

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 3912061..86fb2c8 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -63,10 +63,10 @@ static int show_other_interrupts(struct seq_file *p, int prec) 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"); + seq_printf(p, "%*s: ", prec, "PMI"); 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, " Performance monitoring interrupts\n"); seq_printf(p, "%*s: ", prec, "PND"); for_each_online_cpu(j) seq_printf(p, "%10u ", irq_stats(j)->apic_pending_irqs);