瀏覽代碼

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core

Ingo Molnar 15 年之前
父節點
當前提交
915e555822
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      kernel/perf_event.c

+ 2 - 1
kernel/perf_event.c

@@ -2933,7 +2933,7 @@ again:
 	 */
 	 */
 
 
 	if (!local_dec_and_test(&data->nest))
 	if (!local_dec_and_test(&data->nest))
-		return;
+		goto out;
 
 
 	/*
 	/*
 	 * Publish the known good head. Rely on the full barrier implied
 	 * Publish the known good head. Rely on the full barrier implied
@@ -2954,6 +2954,7 @@ again:
 	if (handle->wakeup != local_read(&data->wakeup))
 	if (handle->wakeup != local_read(&data->wakeup))
 		perf_output_wakeup(handle);
 		perf_output_wakeup(handle);
 
 
+ out:
 	preempt_enable();
 	preempt_enable();
 }
 }