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_stack.c | |
| parent | 4ec78467858739c0119569c0610676aa50dfa8fb (diff) | |
| parent | 0f17976568b3f72e676450af0c0db6f8752253d6 (diff) | |
| download | linux-4dce17b26b6ac3bf29aa0eae1d28e14debe37747.tar.gz linux-4dce17b26b6ac3bf29aa0eae1d28e14debe37747.tar.bz2 linux-4dce17b26b6ac3bf29aa0eae1d28e14debe37747.zip | |
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_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 76aa04d4c925..b4a751e8f9d6 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -409,7 +409,9 @@ static const struct file_operations stack_trace_fops = { static int stack_trace_filter_open(struct inode *inode, struct file *file) { - return ftrace_regex_open(&trace_ops, FTRACE_ITER_FILTER, + struct ftrace_ops *ops = inode->i_private; + + return ftrace_regex_open(ops, FTRACE_ITER_FILTER, inode, file); } @@ -476,7 +478,7 @@ static __init int stack_trace_init(void) NULL, &stack_trace_fops); trace_create_file("stack_trace_filter", 0444, d_tracer, - NULL, &stack_trace_filter_fops); + &trace_ops, &stack_trace_filter_fops); if (stack_trace_filter_buf[0]) ftrace_set_early_filter(&trace_ops, stack_trace_filter_buf, 1); |