Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
This commit is contained in:
commit
915e555822
@ -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)
|
|||||||
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user