diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2025-11-19 15:26:25 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2025-11-19 15:26:25 +0100 |
| commit | d4f14fa5c6c4d39b5187e1f410d59e38d76f283f (patch) | |
| tree | 8666bd4fcd78149936221a64707c4dc6ca75a9f8 /kernel/trace/ring_buffer.c | |
| parent | 949f1fd2225baefbea2995afa807dba5cbdb6bd3 (diff) | |
| parent | 6a23ae0a96a600d1d12557add110e0bb6e32730c (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get fixes from v6.18-rc6.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 1244d2c5c384..afcd3747264d 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -7344,6 +7344,10 @@ consume: goto out; } + /* Did the reader catch up with the writer? */ + if (cpu_buffer->reader_page == cpu_buffer->commit_page) + goto out; + reader = rb_get_reader_page(cpu_buffer); if (WARN_ON(!reader)) goto out; |