aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/perf_event_p4.h
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2010-03-15 22:12:36 -0400
committerIngo Molnar <mingo@elte.hu>2010-03-16 04:37:46 -0400
commit8ea7f544100844307072cae2f5fc108afdef999a (patch)
treef8de71807a2f5c4a30a055f13a297177442a6240 /arch/x86/include/asm/perf_event_p4.h
parent1d199b1ad606ae8b88acebd295b101c4e1cf2a57 (diff)
x86, perf: Fix comments in Pentium-4 PMU definitions
Reported-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <1268705556.3379.8.camel@minggr.sh.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/perf_event_p4.h')
-rw-r--r--arch/x86/include/asm/perf_event_p4.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/include/asm/perf_event_p4.h b/arch/x86/include/asm/perf_event_p4.h
index b47b9e9ac13f..b842b3238e46 100644
--- a/arch/x86/include/asm/perf_event_p4.h
+++ b/arch/x86/include/asm/perf_event_p4.h
@@ -319,6 +319,7 @@ static inline u32 p4_default_escr_conf(int cpu, int exclude_os, int exclude_usr)
319 319
320#define P4_BSQ_ACTIVE_ENTRIES P4_EVENT_PACK(0x06, 0x07) 320#define P4_BSQ_ACTIVE_ENTRIES P4_EVENT_PACK(0x06, 0x07)
321 /* 321 /*
322 * NOTE: no ESCR name in docs, it's guessed
322 * MSR_P4_BSU_ESCR1: 2, 3 323 * MSR_P4_BSU_ESCR1: 2, 3
323 */ 324 */
324 325
@@ -468,8 +469,8 @@ static inline u32 p4_default_escr_conf(int cpu, int exclude_os, int exclude_usr)
468 469
469#define P4_UOPS_RETIRED P4_EVENT_PACK(0x01, 0x04) 470#define P4_UOPS_RETIRED P4_EVENT_PACK(0x01, 0x04)
470 /* 471 /*
471 * MSR_P4_CRU_ESCR2: 12, 13, 16 472 * MSR_P4_CRU_ESCR0: 12, 13, 16
472 * MSR_P4_CRU_ESCR3: 14, 15, 17 473 * MSR_P4_CRU_ESCR1: 14, 15, 17
473 */ 474 */
474 475
475#define P4_UOP_TYPE P4_EVENT_PACK(0x02, 0x02) 476#define P4_UOP_TYPE P4_EVENT_PACK(0x02, 0x02)