From ac37281534e61aae5c3120d107d2238ecd11a0f8 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Mon, 12 May 2008 21:20:58 +0200
Subject: [PATCH] --- yaml --- r: 100516 b: refs/heads/master c:
 2dc8f09571a61d9cb3dc47bba6608689dfe15d16 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2ab791750f83..cad07806b93c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 845279972f1736c3463c9cebd1bad92a0a347176
+refs/heads/master: 2dc8f09571a61d9cb3dc47bba6608689dfe15d16
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 2af940433e96..3b4eaf36ed5d 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -2233,6 +2233,10 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 	start = 0;
 
 	while (trace_empty(iter)) {
+
+		if ((filp->f_flags & O_NONBLOCK))
+			return -EAGAIN;
+
 		/*
 		 * This is a make-shift waitqueue. The reason we don't use
 		 * an actual wait queue is because: