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/ftrace.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/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index e392f750a1cf..f8c18f15b190 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -4653,9 +4653,6 @@ static int ftrace_process_regex(struct ftrace_iterator *iter, command = strsep(&next, ":"); - if (WARN_ON_ONCE(!tr)) - return -EINVAL; - mutex_lock(&ftrace_cmd_mutex); list_for_each_entry(p, &ftrace_commands, list) { if (strcmp(p->name, command) == 0) { |