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

torvalds · torvalds · commit b57cea5e3328 · 2012-01-26T12:45:57.000-08:00
* '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
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,6 @@ int get_callchain_buffers(void)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`err = alloc_callchain_buffers();`
`118`		`- if (err)`
`119`		`- release_callchain_buffers();`
`120`	`118`	`exit:`
`121`	`119`	`mutex_unlock(&callchain_mutex);`
`122`	`120`