From a3e5541be911311c31ea6883a4964cecc9fac460 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 7 Nov 2008 22:36:02 -0500
Subject: [PATCH] --- yaml --- r: 121071 b: refs/heads/master c:
 0183fb1c94b74862b073590fc52c56b7364b7bad h: refs/heads/master i:   121069:
 e73d7a02946c261f3153b696709699dfd1ca5366   121067:
 bc47981029c947fd931840a1d7ab213c861d6797   121063:
 4d94fe6fe5dd2546878b5e14e875aaa2c5dab7e6   121055:
 dc5d47559baa5731b37c8aff5a8ecfb9a17d1e4b v: v3

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

diff --git a/[refs] b/[refs]
index 6441375c75a3..d328b48ac943 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6b0786f7f83bcc4d414a2977aaebe2941ebe1de
+refs/heads/master: 0183fb1c94b74862b073590fc52c56b7364b7bad
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 896c71f0f4c4..4d2e751bfb11 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -765,6 +765,9 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
 		    ((iter->flags & FTRACE_ITER_FAILURES) &&
 		     !(rec->flags & FTRACE_FL_FAILED)) ||
 
+		    ((iter->flags & FTRACE_ITER_FILTER) &&
+		     !(rec->flags & FTRACE_FL_FILTER)) ||
+
 		    ((iter->flags & FTRACE_ITER_NOTRACE) &&
 		     !(rec->flags & FTRACE_FL_NOTRACE))) {
 			rec = NULL;