iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Call perf_cgroup_event_time() directly
  perf: Don't call release_callchain_buffers() if allocation fails
This commit is contained in:
Linus Torvalds 2012-01-26 12:45:57 -08:00
commit b57cea5e33
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/events/callchain.c
View File

@ -115,8 +115,6 @@ int get_callchain_buffers(void)
} }
err = alloc_callchain_buffers(); err = alloc_callchain_buffers();
if (err)
release_callchain_buffers();
exit: exit:
mutex_unlock(&callchain_mutex); mutex_unlock(&callchain_mutex);

2
kernel/events/core.c
View File

@ -815,7 +815,7 @@ static void update_event_times(struct perf_event *event)
* here. * here.
*/ */
if (is_cgroup_event(event)) if (is_cgroup_event(event))
run_end = perf_event_time(event); run_end = perf_cgroup_event_time(event);
else if (ctx->is_active) else if (ctx->is_active)
run_end = ctx->time; run_end = ctx->time;
else else