diff options
| author |   Steven Rostedt <rostedt@goodmis.org> | 2008-08-14 22:47:17 -0400 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-10-14 10:35:05 +0200 |
| commit | a9fdda33cd7c7519b082e37538fe790f9ff684bb (patch) | |
| tree | 56d16d69e519e127a2090df6a16aa9029e8c0e05 /kernel/trace/ftrace.c | |
| parent | ftrace: use only 5 byte nops for x86 (diff) | |
| download | linux-dev-a9fdda33cd7c7519b082e37538fe790f9ff684bb.tar.xz linux-dev-a9fdda33cd7c7519b082e37538fe790f9ff684bb.zip | |
ftrace: do not show freed records in available_filter_functions
Seems that freed records can appear in the available_filter_functions list.
This patch fixes that.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index ea45bb1c0fd6..8affb6d00ec1 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -872,15 +872,13 @@ t_next(struct seq_file *m, void *v, loff_t *pos) } } else { rec = &iter->pg->records[iter->idx++]; - if ((!(iter->flags & FTRACE_ITER_FAILURES) && + if ((rec->flags & FTRACE_FL_FREE) || + + (!(iter->flags & FTRACE_ITER_FAILURES) && (rec->flags & FTRACE_FL_FAILED)) || ((iter->flags & FTRACE_ITER_FAILURES) && - (!(rec->flags & FTRACE_FL_FAILED) || - (rec->flags & FTRACE_FL_FREE))) || - - ((iter->flags & FTRACE_ITER_FILTER) && - !(rec->flags & FTRACE_FL_FILTER)) || + !(rec->flags & FTRACE_FL_FAILED)) || ((iter->flags & FTRACE_ITER_NOTRACE) && !(rec->flags & FTRACE_FL_NOTRACE))) { |