diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-07 07:54:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-07 07:54:40 -0800 |
| commit | 513c1a3d3f1982fb850c910937099525b0d35e24 (patch) | |
| tree | b18ec2846eb82eb8137ca32c728c1d31e0b4003d | |
| parent | 05ecb680708a1dbe6554d6fc17e5d9a8a7cb5e6a (diff) | |
| parent | 3e46d910d8acf94e5360126593b68bf4fee4c4a1 (diff) | |
| download | linux-513c1a3d3f1982fb850c910937099525b0d35e24.tar.gz linux-513c1a3d3f1982fb850c910937099525b0d35e24.tar.bz2 linux-513c1a3d3f1982fb850c910937099525b0d35e24.zip | |
Merge tag 'trace-v6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull tracing fix from Steven Rostedt:
"Fix regression in poll() and select()
With the fix that made poll() and select() block if read would block
caused a slight regression in rasdaemon, as it needed that kind of
behavior. Add a way to make that behavior come back by writing zero
into the 'buffer_percentage', which means to never block on read"
* tag 'trace-v6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
tracing: Fix poll() and select() do not work on per_cpu trace_pipe and trace_pipe_raw
| -rw-r--r-- | kernel/trace/trace.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 78ed5f1baa8c..c9e40f692650 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9148,9 +9148,6 @@ buffer_percent_write(struct file *filp, const char __user *ubuf, if (val > 100) return -EINVAL; - if (!val) - val = 1; - tr->buffer_percent = val; (*ppos)++; |