perf/x86: Fix shared register mutual exclusion enforcement

[~andy/linux] / arch / x86 / kernel / cpu / perf_event_intel.c

diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 5877f372b03d8253c7252c51637fb0c3149be615..fbc9210b45bcbe62fd2c1b765a46701c2eb21212 100644 (file)
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -1450,7 +1450,6 @@ x86_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event)
        if (x86_pmu.event_constraints) {
                for_each_event_constraint(c, x86_pmu.event_constraints) {
                        if ((event->hw.config & c->cmask) == c->code) {
-                               /* hw.flags zeroed at initialization */
                                event->hw.flags |= c->flags;
                                return c;
                        }
@@ -1498,7 +1497,6 @@ intel_put_shared_regs_event_constraints(struct cpu_hw_events *cpuc,
 static void intel_put_event_constraints(struct cpu_hw_events *cpuc,
                                        struct perf_event *event)
 {
-       event->hw.flags = 0;
        intel_put_shared_regs_event_constraints(cpuc, event);
 }