Commit b57cea5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2437dcbf 46cd6a7f

kernel/events/callchain.c

+0 −2
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ int get_callchain_buffers(void) 
	}



	err = alloc_callchain_buffers();

	if (err)

		release_callchain_buffers();

exit:

	mutex_unlock(&callchain_mutex);

kernel/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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