diff options
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/ftrace.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 98ae4ed965db..2b3e23991c8a 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
| @@ -2870,7 +2870,9 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag, | |||
| 2870 | static int | 2870 | static int |
| 2871 | ftrace_filter_open(struct inode *inode, struct file *file) | 2871 | ftrace_filter_open(struct inode *inode, struct file *file) |
| 2872 | { | 2872 | { |
| 2873 | return ftrace_regex_open(&global_ops, | 2873 | struct ftrace_ops *ops = inode->i_private; |
| 2874 | |||
| 2875 | return ftrace_regex_open(ops, | ||
| 2874 | FTRACE_ITER_FILTER | FTRACE_ITER_DO_HASH, | 2876 | FTRACE_ITER_FILTER | FTRACE_ITER_DO_HASH, |
| 2875 | inode, file); | 2877 | inode, file); |
| 2876 | } | 2878 | } |
| @@ -2878,7 +2880,9 @@ ftrace_filter_open(struct inode *inode, struct file *file) | |||
| 2878 | static int | 2880 | static int |
| 2879 | ftrace_notrace_open(struct inode *inode, struct file *file) | 2881 | ftrace_notrace_open(struct inode *inode, struct file *file) |
| 2880 | { | 2882 | { |
| 2881 | return ftrace_regex_open(&global_ops, FTRACE_ITER_NOTRACE, | 2883 | struct ftrace_ops *ops = inode->i_private; |
| 2884 | |||
| 2885 | return ftrace_regex_open(ops, FTRACE_ITER_NOTRACE, | ||
| 2882 | inode, file); | 2886 | inode, file); |
| 2883 | } | 2887 | } |
| 2884 | 2888 | ||
| @@ -4118,10 +4122,10 @@ static __init int ftrace_init_dyn_debugfs(struct dentry *d_tracer) | |||
| 4118 | d_tracer, NULL, &ftrace_enabled_fops); | 4122 | d_tracer, NULL, &ftrace_enabled_fops); |
| 4119 | 4123 | ||
| 4120 | trace_create_file("set_ftrace_filter", 0644, d_tracer, | 4124 | trace_create_file("set_ftrace_filter", 0644, d_tracer, |
| 4121 | NULL, &ftrace_filter_fops); | 4125 | &global_ops, &ftrace_filter_fops); |
| 4122 | 4126 | ||
| 4123 | trace_create_file("set_ftrace_notrace", 0644, d_tracer, | 4127 | trace_create_file("set_ftrace_notrace", 0644, d_tracer, |
| 4124 | NULL, &ftrace_notrace_fops); | 4128 | &global_ops, &ftrace_notrace_fops); |
| 4125 | 4129 | ||
| 4126 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 4130 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
| 4127 | trace_create_file("set_graph_function", 0444, d_tracer, | 4131 | trace_create_file("set_graph_function", 0444, d_tracer, |
