summaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-01-27 12:01:41 +0100
committerIngo Molnar <mingo@elte.hu>2012-01-27 12:01:43 +0100
commit801493c2e249a7314e9e8e54ad60d613d0a86f14 (patch)
treec8f77ce14e76abec848366812a0aad0fad4f539c /kernel/events
parent939ddcfa60dabfaed390987bf0103a6654c0fe30 (diff)
parent74ea15d909b31158f9b63190a95b52bc05586d4b (diff)
downloadop-kernel-dev-801493c2e249a7314e9e8e54ad60d613d0a86f14.zip
op-kernel-dev-801493c2e249a7314e9e8e54ad60d613d0a86f14.tar.gz
Merge branch 'linus' into perf/core
Merge reason: pick up fixes that are upstream, we need them because we'll apply dependent patches. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/callchain.c2
-rw-r--r--kernel/events/core.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 057e24b..6581a04 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -115,8 +115,6 @@ int get_callchain_buffers(void)
}
err = alloc_callchain_buffers();
- if (err)
- release_callchain_buffers();
exit:
mutex_unlock(&callchain_mutex);
diff --git a/kernel/events/core.c b/kernel/events/core.c
index a8f4ac0..32b48c8 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -815,7 +815,7 @@ static void update_event_times(struct perf_event *event)
* here.
*/
if (is_cgroup_event(event))
- run_end = perf_event_time(event);
+ run_end = perf_cgroup_event_time(event);
else if (ctx->is_active)
run_end = ctx->time;
else
OpenPOWER on IntegriCloud