[tip:perf/core] x86, perf: Fix comments in Pentium-4 PMU definitions
From: tip-bot for Lin Ming
Date: Tue Mar 16 2010 - 10:46:42 EST
Commit-ID: 8ea7f544100844307072cae2f5fc108afdef999a
Gitweb: http://git.kernel.org/tip/8ea7f544100844307072cae2f5fc108afdef999a
Author: Lin Ming <ming.m.lin@xxxxxxxxx>
AuthorDate: Tue, 16 Mar 2010 10:12:36 +0800
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 16 Mar 2010 09:37:46 +0100
x86, perf: Fix comments in Pentium-4 PMU definitions
Reported-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
LKML-Reference: <1268705556.3379.8.camel@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/include/asm/perf_event_p4.h | 5 +++--
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 b47b9e9..b842b32 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)
#define P4_BSQ_ACTIVE_ENTRIES P4_EVENT_PACK(0x06, 0x07)
/*
+ * NOTE: no ESCR name in docs, it's guessed
* MSR_P4_BSU_ESCR1: 2, 3
*/
@@ -468,8 +469,8 @@ static inline u32 p4_default_escr_conf(int cpu, int exclude_os, int exclude_usr)
#define P4_UOPS_RETIRED P4_EVENT_PACK(0x01, 0x04)
/*
- * MSR_P4_CRU_ESCR2: 12, 13, 16
- * MSR_P4_CRU_ESCR3: 14, 15, 17
+ * MSR_P4_CRU_ESCR0: 12, 13, 16
+ * MSR_P4_CRU_ESCR1: 14, 15, 17
*/
#define P4_UOP_TYPE P4_EVENT_PACK(0x02, 0x02)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/