2 files changed, 7 insertions, 9 deletions

diff --git a/arch/x86/include/asm/perf_event_p4.h b/arch/x86/include/asm/perf_event_p4.h
index 829f4711645f..b47b9e9ac13f 100644
--- a/arch/x86/include/asm/perf_event_p4.h
+++ b/arch/x86/include/asm/perf_event_p4.h
@@ -324,8 +324,8 @@ static inline u32 p4_default_escr_conf(int cpu, int exclude_os, int exclude_usr)
 
 #define P4_SSE_INPUT_ASSIST             P4_EVENT_PACK(0x34, 0x01)
         /*
-         * MSR_P4_FIRM_ESCR:    8, 9
-         * MSR_P4_FIRM_ESCR:    10, 11
+         * MSR_P4_FIRM_ESCR0:   8, 9
+         * MSR_P4_FIRM_ESCR1:   10, 11
          */
 
 #define P4_PACKED_SP_UOP                P4_EVENT_PACK(0x08, 0x01)
@@ -462,8 +462,8 @@ static inline u32 p4_default_escr_conf(int cpu, int exclude_os, int exclude_usr)
 
 #define P4_INSTR_RETIRED                P4_EVENT_PACK(0x02, 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_UOPS_RETIRED                 P4_EVENT_PACK(0x01, 0x04)
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c
index ef861da1c8ab..a11ce73a93c9 100644
--- a/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/arch/x86/kernel/cpu/perf_event_p4.c
@@ -60,13 +60,11 @@ struct p4_event_template p4_templates[] = {
         [2] = {
                 .opcode = P4_INSTR_RETIRED,
                 .config = 0,
-                .dep    = 0, /* needs front-end tagging */
+                .dep    = -1, /* needs front-end tagging */
                 .emask  =
                         P4_EVENT_ATTR(P4_INSTR_RETIRED, NBOGUSNTAG)     |
-                        P4_EVENT_ATTR(P4_INSTR_RETIRED, NBOGUSTAG)      |
-                        P4_EVENT_ATTR(P4_INSTR_RETIRED, BOGUSNTAG)      |
-                        P4_EVENT_ATTR(P4_INSTR_RETIRED, BOGUSTAG),
-                .escr_msr       = { MSR_P4_CRU_ESCR2, MSR_P4_CRU_ESCR3 },
+                        P4_EVENT_ATTR(P4_INSTR_RETIRED, BOGUSNTAG),
+                .escr_msr       = { MSR_P4_CRU_ESCR0, MSR_P4_CRU_ESCR1 },
                 .cntr           = { 12, 14 },
         },
         [3] = {