diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-02-04 14:09:33 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-02-04 14:09:33 -0800 |
| commit | c8bdef1560d976340e421d5e188f94789e4cfa28 (patch) | |
| tree | cee684e80305ca00c97fcfcf8527c23b8f1df7a2 /kernel/trace/ring_buffer.c | |
| parent | 349bd87f6091ac68b8eab368ce30bcaf6d45c50e (diff) | |
| parent | 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 (diff) | |
Merge branch 'master' into mm-hotfixes-stable
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; |