From 59d561b08b7c578747457eb657744a1963c700fd 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: 100513 b: refs/heads/master c:
 8487c23765b6e0444ec6b5f1530766d63fe68e35 h: refs/heads/master i:   100511:
 967081aeccce2bf535795822b16d108b21d57f8e v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c029686029b2..6c873a4bac4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d17d969160c18b631a19c2b34d260691402650f8
+refs/heads/master: 8487c23765b6e0444ec6b5f1530766d63fe68e35
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 9197782d15c9..fd4ecc292005 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/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: