Messages in this thread Patch in this message | | | Date | Thu, 26 Jan 2012 19:11:56 +0100 | From | Ingo Molnar <> | Subject | [GIT PULL] perf fixes |
| |
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
HEAD: 46cd6a7f680d14f6f80ede9f04aeb70fa83bd266 perf: Call perf_cgroup_event_time() directly
Thanks,
Ingo
------------------> Namhyung Kim (2): perf: Don't call release_callchain_buffers() if allocation fails perf: Call perf_cgroup_event_time() directly
kernel/events/callchain.c | 2 -- kernel/events/core.c | 2 +- 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
| |