Skip to content

Commit 513c1a3

Browse files
committed
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
2 parents 05ecb68 + 3e46d91 commit 513c1a3

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

kernel/trace/trace.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9148,9 +9148,6 @@ buffer_percent_write(struct file *filp, const char __user *ubuf,
91489148
if (val > 100)
91499149
return -EINVAL;
91509150

9151-
if (!val)
9152-
val = 1;
9153-
91549151
tr->buffer_percent = val;
91559152

91569153
(*ppos)++;

0 commit comments

Comments
 (0)