Skip to content

Commit e81fe50

Browse files
committed
Merge tag 'perf-urgent-2023-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 perf event fix from Ingo Molnar: "Fix a bug in the Intel hybrid CPUs hardware-capabilities enumeration code resulting in non-working events on those platforms" * tag 'perf-urgent-2023-11-26' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/intel: Correct incorrect 'or' operation for PMU capabilities
2 parents 1d0dbc3 + e8df9d9 commit e81fe50

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/events/intel/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4660,7 +4660,7 @@ static void intel_pmu_check_hybrid_pmus(struct x86_hybrid_pmu *pmu)
46604660
if (pmu->intel_cap.pebs_output_pt_available)
46614661
pmu->pmu.capabilities |= PERF_PMU_CAP_AUX_OUTPUT;
46624662
else
4663-
pmu->pmu.capabilities |= ~PERF_PMU_CAP_AUX_OUTPUT;
4663+
pmu->pmu.capabilities &= ~PERF_PMU_CAP_AUX_OUTPUT;
46644664

46654665
intel_pmu_check_event_constraints(pmu->event_constraints,
46664666
pmu->num_counters,

0 commit comments

Comments
 (0)