perf events fix
Subsystems (2)
Linus,
Please pull the latest perf/urgent git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2023-11-26
# HEAD: e8df9d9f4209c04161321d8c12640ae560f65939 perf/x86/intel: Correct incorrect 'or' operation for PMU capabilities
Fix a bug in the Intel hybrid CPUs hardware-capabilities enumeration code resulting in non-working events on those platforms.
Thanks,
Ingo
------------------>
Dapeng Mi (1):
perf/x86/intel: Correct incorrect 'or' operation for PMU capabilities
arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/core.c +1 -1
@@ -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,
The pull request you sent on Sun, 26 Nov 2023 10:43:21 +0100:
The pull request you sent on Sun, 26 Nov 2023 10:43:21 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitperf-urgent-2023-11-26
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e81fe505202fdc07b1925aa70fca5e2a714eb259
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/prtracker.html