Commit e81fe505 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1d0dbc3d e8df9d9f

arch/x86/events/intel/core.c

+1 −1
Original line number Diff line number Diff line
@@ -4660,7 +4660,7 @@ static void intel_pmu_check_hybrid_pmus(struct x86_hybrid_pmu *pmu) 
	if (pmu->intel_cap.pebs_output_pt_available)

		pmu->pmu.capabilities |= PERF_PMU_CAP_AUX_OUTPUT;

	else

		pmu->pmu.capabilities |= ~PERF_PMU_CAP_AUX_OUTPUT;

		pmu->pmu.capabilities &= ~PERF_PMU_CAP_AUX_OUTPUT;



	intel_pmu_check_event_constraints(pmu->event_constraints,

					  pmu->num_counters,