diff --git a/[refs] b/[refs] index a42dbac81f3b..286181a46d40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aaba98018b8295dfa2119345d17f833d74448cd0 +refs/heads/master: 329d876d6fd326109f191ae0fb2798b8834fb70b diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 070f92d3232a..367299f91aaf 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/kernel/perf_counter.c @@ -3122,6 +3122,8 @@ perf_counter_alloc(struct perf_counter_hw_event *hw_event, counter->group_leader = group_leader; counter->pmu = NULL; counter->ctx = ctx; + counter->oncpu = -1; + get_ctx(ctx); counter->state = PERF_COUNTER_STATE_INACTIVE;