diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-05-20 22:01:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-20 22:01:12 +0200 |
| commit | 915e555822629421d97f851c6b87bf4c314ed8c9 (patch) | |
| tree | 783922f4fa83f6c79edda2d723fb5417744e7270 | |
| parent | perf annotate: Use build-ids to find the right DSO (diff) | |
| parent | perf: Fix forgotten preempt_enable by nested writers (diff) | |
| download | linux-dev-915e555822629421d97f851c6b87bf4c314ed8c9.tar.xz linux-dev-915e555822629421d97f851c6b87bf4c314ed8c9.zip | |
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.c | 3 |
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: */ 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(); } |