diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-07-05 09:51:24 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-07-05 09:51:24 -0400 |
| commit | 4dce17b26b6ac3bf29aa0eae1d28e14debe37747 (patch) | |
| tree | 5152c0fd981fbef6389cab76388c93b93f74f17d /kernel/trace/trace.c | |
| parent | 4ec78467858739c0119569c0610676aa50dfa8fb (diff) | |
| parent | 0f17976568b3f72e676450af0c0db6f8752253d6 (diff) | |
Merge commit '0f17976568b3f72e676450af0c0db6f8752253d6' into trace/ftrace/core
Need to get the changes from 0f17976568b3 ("ftrace: Fix regression with
module command in stack_trace_filter") as it is required to fix some other
changes with stack_trace_filter and the new development code.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c579dea4a0eb..00e2e4169b1e 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6957,6 +6957,9 @@ ftrace_trace_snapshot_callback(struct trace_array *tr, struct ftrace_hash *hash, char *number; int ret; + if (!tr) + return -ENODEV; + /* hash funcs only work with set_ftrace_filter */ if (!enable) return -EINVAL; |