diff options
author | Maxime Ripard <mripard@kernel.org> | 2024-02-26 17:23:00 +0300 |
---|---|---|
committer | Maxime Ripard <mripard@kernel.org> | 2024-02-26 17:23:00 +0300 |
commit | 2f910859724b53f1cd3579246e3d9bebb16d78b8 (patch) | |
tree | 75cd2329b7e737865bf28ea734a2e0649c02a5bf /kernel/trace/ring_buffer.c | |
parent | 86bf8cfda6d2a6720fa2e6e676c98f0882c9d3d7 (diff) | |
parent | 72fa02fdf83306c52bc1eede28359e3fa32a151a (diff) | |
download | linux-2f910859724b53f1cd3579246e3d9bebb16d78b8.tar.xz |
Merge drm/drm-fixes into drm-misc-fixes
Sima needs a more recent release to apply a patch.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'kernel/trace/ring_buffer.c')
-rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 13aaf5e85b81..fd4bfe3ecf01 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -944,7 +944,7 @@ __poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu, full = 0; } else { if (!cpumask_test_cpu(cpu, buffer->cpumask)) - return -EINVAL; + return EPOLLERR; cpu_buffer = buffer->buffers[cpu]; work = &cpu_buffer->irq_work; |