Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/frederic/random-tracing into perf/core
mariux64 · May 20, 2010 · 915e555 · 915e555
2 parents b36f19d + acd35a4
commit 915e555
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
@@ -2933,7 +2933,7 @@ static void perf_output_put_handle(struct perf_output_handle *handle)
 	 */
 
 	if (!local_dec_and_test(&data->nest))
-		return;
+		goto out;
 
 	/*
 	 * Publish the known good head. Rely on the full barrier implied
@@ -2954,6 +2954,7 @@ static void perf_output_put_handle(struct perf_output_handle *handle)
 	if (handle->wakeup != local_read(&data->wakeup))
 		perf_output_wakeup(handle);
 
+ out:
 	preempt_enable();
 }