Commit 915e5558 authored by Ingo Molnar's avatar Ingo Molnar

Merge branch 'perf/core' of...

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
parents b36f19d5 acd35a46
...@@ -2933,7 +2933,7 @@ static void perf_output_put_handle(struct perf_output_handle *handle) ...@@ -2933,7 +2933,7 @@ static void perf_output_put_handle(struct perf_output_handle *handle)
*/ */
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 @@ static void perf_output_put_handle(struct perf_output_handle *handle) ...@@ -2954,6 +2954,7 @@ static void perf_output_put_handle(struct perf_output_handle *handle)
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();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment