* [PATCH] x86,perf: fix comments in p4 pmu definitions
@ 2010-03-16 2:12 Lin Ming
2010-03-16 14:45 ` [tip:perf/core] x86, perf: Fix comments in Pentium-4 PMU definitions tip-bot for Lin Ming
0 siblings, 1 reply; 2+ messages in thread
From: Lin Ming @ 2010-03-16 2:12 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Cyrill Gorcunov, lkml
Reported-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:perf/core] x86, perf: Fix comments in Pentium-4 PMU definitions
2010-03-16 2:12 [PATCH] x86,perf: fix comments in p4 pmu definitions Lin Ming
@ 2010-03-16 14:45 ` tip-bot for Lin Ming
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Lin Ming @ 2010-03-16 14:45 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, acme, paulus, hpa, mingo, gorcunov, a.p.zijlstra,
efault, fweisbec, ming.m.lin, tglx, mingo
Commit-ID: 8ea7f544100844307072cae2f5fc108afdef999a
Gitweb: http://git.kernel.org/tip/8ea7f544100844307072cae2f5fc108afdef999a
Author: Lin Ming <ming.m.lin@intel.com>
AuthorDate: Tue, 16 Mar 2010 10:12:36 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 16 Mar 2010 09:37:46 +0100
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>
---
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-16 14:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-16 2:12 [PATCH] x86,perf: fix comments in p4 pmu definitions Lin Ming
2010-03-16 14:45 ` [tip:perf/core] x86, perf: Fix comments in Pentium-4 PMU definitions tip-bot for Lin Ming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome