From 8eb0b39ca4ceae5517d783e6b39523e12fbd6d98 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
Date: Thu, 9 May 2013 19:31:48 -0400
Subject: [PATCH] --- yaml --- r: 375455 b: refs/heads/master c:
 23ea9c4dda129fe1711f9fbda03c7a9c91cf1322 h: refs/heads/master i:   375453:
 d29932f99a6c25d48db80bcf974218e7ad217be4   375451:
 4923908312de3861e17d9acd6dab42ab047105c5   375447:
 f76de1581f0924983934518fbbfe0c04a6d7c447   375439:
 f0b00d94874ca80f5a24caacdffa1595f0c84bc8   375423:
 e1cb8752a5e075c20d027daa4c351ebee6c07dbc v: v3

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

diff --git a/[refs] b/[refs]
index f5b3669cdb8f..045a3b41dd71 100644
--- 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
index f104c45cbcc1..dcca9fa29bf4 100644
--- 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;