aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
index 12d9548457e7..6d6e85dd5849 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
@@ -164,8 +164,8 @@
164 ((1ULL << (n)) - 1))) 164 ((1ULL << (n)) - 1)))
165 165
166/* Haswell-EP Ubox */ 166/* Haswell-EP Ubox */
167#define HSWEP_U_MSR_PMON_CTR0 0x705 167#define HSWEP_U_MSR_PMON_CTR0 0x709
168#define HSWEP_U_MSR_PMON_CTL0 0x709 168#define HSWEP_U_MSR_PMON_CTL0 0x705
169#define HSWEP_U_MSR_PMON_FILTER 0x707 169#define HSWEP_U_MSR_PMON_FILTER 0x707
170 170
171#define HSWEP_U_MSR_PMON_UCLK_FIXED_CTL 0x703 171#define HSWEP_U_MSR_PMON_UCLK_FIXED_CTL 0x703
@@ -1914,7 +1914,7 @@ static struct intel_uncore_type hswep_uncore_cbox = {
1914 .name = "cbox", 1914 .name = "cbox",
1915 .num_counters = 4, 1915 .num_counters = 4,
1916 .num_boxes = 18, 1916 .num_boxes = 18,
1917 .perf_ctr_bits = 44, 1917 .perf_ctr_bits = 48,
1918 .event_ctl = HSWEP_C0_MSR_PMON_CTL0, 1918 .event_ctl = HSWEP_C0_MSR_PMON_CTL0,
1919 .perf_ctr = HSWEP_C0_MSR_PMON_CTR0, 1919 .perf_ctr = HSWEP_C0_MSR_PMON_CTR0,
1920 .event_mask = SNBEP_CBO_MSR_PMON_RAW_EVENT_MASK, 1920 .event_mask = SNBEP_CBO_MSR_PMON_RAW_EVENT_MASK,