tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds e81fe505 1d0dbc3d

options
unified split
Changed files
+1 -1
arch
x86
events
intel
core.c
+1 -1
arch/x86/events/intel/core.c
··· 4660 if (pmu->intel_cap.pebs_output_pt_available) 4661 pmu->pmu.capabilities |= PERF_PMU_CAP_AUX_OUTPUT; 4662 else 4663 - pmu->pmu.capabilities |= ~PERF_PMU_CAP_AUX_OUTPUT; 4664 4665 intel_pmu_check_event_constraints(pmu->event_constraints, 4666 pmu->num_counters,
··· 4660 if (pmu->intel_cap.pebs_output_pt_available) 4661 pmu->pmu.capabilities |= PERF_PMU_CAP_AUX_OUTPUT; 4662 else 4663 + pmu->pmu.capabilities &= ~PERF_PMU_CAP_AUX_OUTPUT; 4664 4665 intel_pmu_check_event_constraints(pmu->event_constraints, 4666 pmu->num_counters,