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: