1 files changed, 7 insertions, 3 deletions

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index f9451566cd9b..d35f4775d5f1 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -2091,15 +2091,19 @@ static void intel_pmu_disable_event(struct perf_event *event)
         cpuc->intel_ctrl_host_mask &= ~(1ull << hwc->idx);
         cpuc->intel_cp_status &= ~(1ull << hwc->idx);
 
-        if (unlikely(event->attr.precise_ip))
-                intel_pmu_pebs_disable(event);
-
         if (unlikely(hwc->config_base == MSR_ARCH_PERFMON_FIXED_CTR_CTRL)) {
                 intel_pmu_disable_fixed(hwc);
                 return;
         }
 
         x86_pmu_disable_event(event);
+
+        /*
+         * Needs to be called after x86_pmu_disable_event,
+         * so we don't trigger the event without PEBS bit set.
+         */
+        if (unlikely(event->attr.precise_ip))
+                intel_pmu_pebs_disable(event);
 }
 
 static void intel_pmu_del_event(struct perf_event *event)