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

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

diff --git a/[refs] b/[refs]
index 95fc1a1575a2..2ab791750f83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5685aede3b7b65e72ddc73b951aa1f70798a614
+refs/heads/master: 845279972f1736c3463c9cebd1bad92a0a347176
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index d141fc98f3a8..2af940433e96 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -2253,6 +2253,9 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 		if (signal_pending(current))
 			return -EINTR;
 
+		if (iter->trace != current_trace)
+			return 0;
+
 		/*
 		 * We block until we read something and tracing is disabled.
 		 * We still block if tracing is disabled, but we have never