diff options
| author | Mark Brown <broonie@kernel.org> | 2025-07-07 21:02:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-07-07 21:02:59 +0100 |
| commit | bb96a315b4d84904edd2dae17910f10022ab71d5 (patch) | |
| tree | e858237bd1335da828da7611979931fe890e33e6 /kernel/events/ring_buffer.c | |
| parent | 12826a49f029cd7ed794b1973ee31922f0e08e6f (diff) | |
| parent | 08dc0f5cc26a203e8008c38d9b436c079e7dbb45 (diff) | |
ASoC: soc-dapm: cleanups
Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
This is prepare to hiding snd_soc_dapm_context inside soc-dapm.c
Diffstat (limited to 'kernel/events/ring_buffer.c')
| -rw-r--r-- | kernel/events/ring_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index d2aef87c7e9f..aa9a759e824f 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -441,7 +441,7 @@ void *perf_aux_output_begin(struct perf_output_handle *handle, * store that will be enabled on successful return */ if (!handle->size) { /* A, matches D */ - event->pending_disable = smp_processor_id(); + perf_event_disable_inatomic(handle->event); perf_output_wakeup(handle); WRITE_ONCE(rb->aux_nest, 0); goto err_put; @@ -526,7 +526,7 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size) if (wakeup) { if (handle->aux_flags & PERF_AUX_FLAG_TRUNCATED) - handle->event->pending_disable = smp_processor_id(); + perf_event_disable_inatomic(handle->event); perf_output_wakeup(handle); } |