---

yaml --- r: 121071 b: refs/heads/master c: 0183fb1 h: refs/heads/master i: 121069: e73d7a0 121067: bc47981 121063: 4d94fe6 121055: dc5d475 v: v3
git-mirror · Nov 8, 2008 · a3e5541 · a3e5541
1 parent 3235e08
commit a3e5541
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;