leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2015-09-13 11:25:55 +02:00
commit 216dcaf290
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/cpu/perf_event_intel.c
View File

@ -2316,9 +2316,12 @@ static struct event_constraint *
intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx, intel_get_event_constraints(struct cpu_hw_events *cpuc, int idx,
struct perf_event *event) struct perf_event *event)
{ {
struct event_constraint *c1 = cpuc->event_constraint[idx]; struct event_constraint *c1 = NULL;
struct event_constraint *c2; struct event_constraint *c2;
if (idx >= 0) /* fake does < 0 */
c1 = cpuc->event_constraint[idx];
/* /*
* first time only * first time only
* - static constraint: no change across incremental scheduling calls * - static constraint: no change across incremental scheduling calls

1
arch/x86/kernel/cpu/perf_event_intel_bts.c
View File

@ -222,6 +222,7 @@ static void __bts_event_start(struct perf_event *event)
if (!buf || bts_buffer_is_full(buf, bts)) if (!buf || bts_buffer_is_full(buf, bts))
return; return;
event->hw.itrace_started = 1;
event->hw.state = 0; event->hw.state = 0;
if (!buf->snapshot) if (!buf->snapshot)