aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-05-20 16:01:12 -0400
committerIngo Molnar <mingo@elte.hu>2010-05-20 16:01:12 -0400
commit915e555822629421d97f851c6b87bf4c314ed8c9 (patch)
tree783922f4fa83f6c79edda2d723fb5417744e7270
parentb36f19d572151abb987ce308a3e066b977a2146f (diff)
parentacd35a463cb2a8d2b28e094d718cf6e653ad7191 (diff)
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
-rw-r--r--kernel/perf_event.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 2a060be3b07f..45b7aec55458 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -2933,7 +2933,7 @@ again:
2933 */ 2933 */
2934 2934
2935 if (!local_dec_and_test(&data->nest)) 2935 if (!local_dec_and_test(&data->nest))
2936 return; 2936 goto out;
2937 2937
2938 /* 2938 /*
2939 * Publish the known good head. Rely on the full barrier implied 2939 * Publish the known good head. Rely on the full barrier implied
@@ -2954,6 +2954,7 @@ again:
2954 if (handle->wakeup != local_read(&data->wakeup)) 2954 if (handle->wakeup != local_read(&data->wakeup))
2955 perf_output_wakeup(handle); 2955 perf_output_wakeup(handle);
2956 2956
2957 out:
2957 preempt_enable(); 2958 preempt_enable();
2958} 2959}
2959 2960