aboutsummaryrefslogtreecommitdiff
path: root/kernel/events
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-03-21 11:03:10 +0100
committerIngo Molnar <mingo@kernel.org>2013-03-21 11:03:10 +0100
commit3bf2391729822e591dcfbbd1e9dd2f450968cdcb (patch)
tree80a0499e57a4cc95b6caea559400b5226ebe606f /kernel/events
parent86e213e1d901fbeaf6e57d13c5edd925fadddcbe (diff)
parentfd4a5aef002bb57e8a35ed34d8a878034b9bde94 (diff)
downloadvexpress-lsk-3bf2391729822e591dcfbbd1e9dd2f450968cdcb.tar.gz
Merge branch 'perf/urgent' into perf/core
Merge in all pending fixes, before pulling the latest development bits from Arnaldo - which will involve merge conflicts. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index efb75b3a69a..7b4a55d41ef 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4449,12 +4449,15 @@ static void perf_event_task_event(struct perf_task_event *task_event)
if (ctxn < 0)
goto next;
ctx = rcu_dereference(current->perf_event_ctxp[ctxn]);
+ if (ctx)
+ perf_event_task_ctx(ctx, task_event);
}
- if (ctx)
- perf_event_task_ctx(ctx, task_event);
next:
put_cpu_ptr(pmu->pmu_cpu_context);
}
+ if (task_event->task_ctx)
+ perf_event_task_ctx(task_event->task_ctx, task_event);
+
rcu_read_unlock();
}
@@ -5662,6 +5665,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event)
event->attr.sample_period = NSEC_PER_SEC / freq;
hwc->sample_period = event->attr.sample_period;
local64_set(&hwc->period_left, hwc->sample_period);
+ hwc->last_period = hwc->sample_period;
event->attr.freq = 0;
}
}