diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2008-05-12 21:20:58 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-23 21:46:39 +0200 |
| commit | 8487c23765b6e0444ec6b5f1530766d63fe68e35 (patch) | |
| tree | 5b3eb6b2361dc756dd3e22173e1d508923700fad | |
| parent | d17d969160c18b631a19c2b34d260691402650f8 (diff) | |
| download | op-kernel-dev-8487c23765b6e0444ec6b5f1530766d63fe68e35.zip op-kernel-dev-8487c23765b6e0444ec6b5f1530766d63fe68e35.tar.gz | |
ftrace: allow trace_pipe to block on all reads
We expect things like "cat" to block on reads to trace_pipe. That's what
trace_pipe is for.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 9197782..fd4ecc2 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2231,8 +2231,6 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, start = 0; while (trace_empty(iter)) { - if (!(trace_flags & TRACE_ITER_BLOCK)) - return -EWOULDBLOCK; /* * This is a make-shift waitqueue. The reason we don't use * an actual wait queue is because: |
