aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-05-20 22:01:12 +0200
committerIngo Molnar <mingo@elte.hu>2010-05-20 22:01:12 +0200
commit915e555822629421d97f851c6b87bf4c314ed8c9 (patch)
tree783922f4fa83f6c79edda2d723fb5417744e7270
parentb36f19d572151abb987ce308a3e066b977a2146f (diff)
parentacd35a463cb2a8d2b28e094d718cf6e653ad7191 (diff)
downloadlinux-2.6.34-ux500-915e555822629421d97f851c6b87bf4c314ed8c9.tar.gz
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 2a060be3b07..45b7aec5545 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -2933,7 +2933,7 @@ again:
*/
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 @@ again:
if (handle->wakeup != local_read(&data->wakeup))
perf_output_wakeup(handle);
+ out:
preempt_enable();
}