diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2024-09-04 12:15:38 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-09-04 12:15:38 +0200 |
| commit | eb876ea724835126f215c9a5bcc9e6148e2a6d15 (patch) | |
| tree | 689c215270b023c2f94a6629c7f1d3ef8e49c28a /kernel/trace/trace.c | |
| parent | cpu/hotplug: Provide weak fallback for arch_cpuhp_init_parallel_bringup() (diff) | |
| parent | Merge tag 'ata-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux (diff) | |
| download | wireguard-linux-eb876ea724835126f215c9a5bcc9e6148e2a6d15.tar.xz wireguard-linux-eb876ea724835126f215c9a5bcc9e6148e2a6d15.zip | |
Merge branch 'linus' into smp/core
Pull in upstream changes so further patches don't conflict.
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 10cd38bce2f1..ebe7ce2f5f4a 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7956,7 +7956,7 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, trace_access_unlock(iter->cpu_file); if (ret < 0) { - if (trace_empty(iter)) { + if (trace_empty(iter) && !iter->closed) { if ((filp->f_flags & O_NONBLOCK)) return -EAGAIN; |