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;