Commit 216dcaf2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes 



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

arch/x86/kernel/cpu/perf_event_intel.c

+4 −1
Original line number Diff line number Diff line
@@ -2316,9 +2316,12 @@ static struct event_constraint * 
intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,

			    struct perf_event *event)

{

	struct event_constraint *c1 = cpuc->event_constraint[idx];

	struct event_constraint *c1 = NULL;

	struct event_constraint *c2;



	if (idx >= 0) /* fake does < 0 */

		c1 = cpuc->event_constraint[idx];



	/*

	 * first time only

	 * - static constraint: no change across incremental scheduling calls

arch/x86/kernel/cpu/perf_event_intel_bts.c

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ static void __bts_event_start(struct perf_event *event) 
	if (!buf || bts_buffer_is_full(buf, bts))

		return;



	event->hw.itrace_started = 1;

	event->hw.state = 0;



	if (!buf->snapshot)