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;