---

yaml --- r: 364914 b: refs/heads/master c: 189e578 h: refs/heads/master v: v3
git-mirror · Mar 15, 2013 · aec9b3a · aec9b3a
1 parent 8c9828e
commit aec9b3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92edca073c374f66b8eee20ec6426fb0cdb6c4d5
+refs/heads/master: 189e5784f6c5e001a84127b83f03bc76a8bfb1ec
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -4593,7 +4593,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
 
 	/* did we read anything? */
 	if (!spd.nr_pages) {
-		if (flags & SPLICE_F_NONBLOCK)
+		if ((file->f_flags & O_NONBLOCK) || (flags & SPLICE_F_NONBLOCK))
 			ret = -EAGAIN;
 		else
 			ret = 0;