---

yaml --- r: 375455 b: refs/heads/master c: 23ea9c4 h: refs/heads/master i: 375453: d29932f 375451: 4923908 375447: f76de15 375439: f0b00d9 375423: e1cb875 v: v3
git-mirror · May 10, 2013 · 8eb0b39 · 8eb0b39
1 parent 5929283
commit 8eb0b39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ae0bf5972b66d35e5674e1b7d855b1e111a68ae
+refs/heads/master: 23ea9c4dda129fe1711f9fbda03c7a9c91cf1322
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
@@ -2459,7 +2459,7 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
 		     !ftrace_lookup_ip(ops->notrace_hash, rec->ip)) ||
 
 		    ((iter->flags & FTRACE_ITER_ENABLED) &&
-		     !(rec->flags & ~FTRACE_FL_MASK))) {
+		     !(rec->flags & FTRACE_FL_ENABLED))) {
 
 			rec = NULL;
 			goto retry;