1 files changed, 9 insertions, 1 deletions

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 453ac9497574..4ef8104958ee 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1622,6 +1622,9 @@ static int x86_pmu_event_idx(struct perf_event *event)
 {
         int idx = event->hw.idx;
 
+        if (!x86_pmu.attr_rdpmc)
+                return 0;
+
         if (x86_pmu.num_counters_fixed && idx >= X86_PMC_IDX_FIXED) {
                 idx -= X86_PMC_IDX_FIXED;
                 idx |= 1 << 30;
@@ -1706,14 +1709,19 @@ static struct pmu pmu = {
         .flush_branch_stack     = x86_pmu_flush_branch_stack,
 };
 
-void perf_update_user_clock(struct perf_event_mmap_page *userpg, u64 now)
+void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)
 {
+        userpg->cap_usr_time = 0;
+        userpg->cap_usr_rdpmc = x86_pmu.attr_rdpmc;
+        userpg->pmc_width = x86_pmu.cntval_bits;
+
         if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
                 return;
 
         if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))
                 return;
 
+        userpg->cap_usr_time = 1;
         userpg->time_mult = this_cpu_read(cyc2ns);
         userpg->time_shift = CYC2NS_SCALE_FACTOR;
         userpg->time_offset = this_cpu_read(cyc2ns_offset) - now;