aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorMike Galbraith <efault@gmx.de>2009-05-10 04:53:05 -0400
committerIngo Molnar <mingo@elte.hu>2009-05-11 06:04:30 -0400
commit8823392360dc4992f87bf4c623834d315f297493 (patch)
tree708334bc4838db7f34a1fb63932f005144b04a95 /arch/x86
parent82afae6016b672acb90ceb8e773bba0bd977d2a3 (diff)
perf_counter, x86: clean up throttling printk
s/PERFMON/perfcounters for perfcounter interrupt throttling warning. 'perfmon' is the CPU feature name that is Intel-only, while we do throttling in a generic way. [ Impact: cleanup ] Signed-off-by: Mike Galbraith <efault@gmx.de> Cc: Robert Richter <robert.richter@amd.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index a6878b0798e5..da27419923a8 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -814,7 +814,7 @@ void perf_counter_unthrottle(void)
814 cpuc = &__get_cpu_var(cpu_hw_counters); 814 cpuc = &__get_cpu_var(cpu_hw_counters);
815 if (cpuc->interrupts >= PERFMON_MAX_INTERRUPTS) { 815 if (cpuc->interrupts >= PERFMON_MAX_INTERRUPTS) {
816 if (printk_ratelimit()) 816 if (printk_ratelimit())
817 printk(KERN_WARNING "PERFMON: max interrupts exceeded!\n"); 817 printk(KERN_WARNING "perfcounters: max interrupts exceeded!\n");
818 hw_perf_restore(cpuc->throttle_ctrl); 818 hw_perf_restore(cpuc->throttle_ctrl);
819 } 819 }
820 cpuc->interrupts = 0; 820 cpuc->interrupts = 0;