diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 12:45:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 12:45:57 -0800 |
| commit | b57cea5e332841ed3e11586c88d3940ea4eacbe7 (patch) | |
| tree | cd12fd5c2fe293c98a09e8526f2dc5966059a149 /kernel | |
| parent | 2437dcbf555bff04e4ee8b8dba4587f946c1cd3d (diff) | |
| parent | 46cd6a7f680d14f6f80ede9f04aeb70fa83bd266 (diff) | |
| download | talos-op-linux-b57cea5e332841ed3e11586c88d3940ea4eacbe7.tar.gz talos-op-linux-b57cea5e332841ed3e11586c88d3940ea4eacbe7.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* '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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/callchain.c | 2 | ||||
| -rw-r--r-- | 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 057e24b665cf..6581a040f399 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 a8f4ac001a00..32b48c889711 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 |
