PWN-Hunter/android_kernel_xiaomi_sdm845
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core

Browse Source
This commit is contained in:
Ingo Molnar 2010-05-20 22:01:12 +02:00
commit 915e555822
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/perf_event.c
View File

@ -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();
} }