Commit dce210a7 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'perf/urgent' 



Keep in sync with the urgent bits.

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
parents bcfd5f64 9f3de72a

arch/x86/events/intel/core.c

+1 −0
Original line number Diff line number Diff line
@@ -7135,6 +7135,7 @@ __init int intel_pmu_init(void) 


	case INTEL_METEORLAKE:

	case INTEL_METEORLAKE_L:

	case INTEL_ARROWLAKE_U:

		intel_pmu_init_hybrid(hybrid_big_small);



		x86_pmu.pebs_latency_data = cmt_latency_data;

arch/x86/events/intel/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ void intel_pmu_pebs_enable(struct perf_event *event) 
			 * hence we need to drain when changing said

			 * size.

			 */

			intel_pmu_drain_large_pebs(cpuc);

			intel_pmu_drain_pebs_buffer();

			adaptive_pebs_record_size_update();

			wrmsrl(MSR_PEBS_DATA_CFG, pebs_data_cfg);

			cpuc->active_pebs_data_cfg = pebs_data_cfg;