Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18c5c7c6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a8d11cd0 f2200ac3

arch/x86/events/intel/lbr.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -507,6 +507,9 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) 
		cpuc->lbr_entries[i].to		= msr_lastbranch.to;

		cpuc->lbr_entries[i].to		= msr_lastbranch.to;

		cpuc->lbr_entries[i].mispred	= 0;

		cpuc->lbr_entries[i].mispred	= 0;

		cpuc->lbr_entries[i].predicted	= 0;

		cpuc->lbr_entries[i].predicted	= 0;

		cpuc->lbr_entries[i].in_tx	= 0;

		cpuc->lbr_entries[i].abort	= 0;

		cpuc->lbr_entries[i].cycles	= 0;

		cpuc->lbr_entries[i].reserved	= 0;

		cpuc->lbr_entries[i].reserved	= 0;

	}

	}

	cpuc->lbr_stack.nr = i;

	cpuc->lbr_stack.nr = i;