diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-12 12:20:36 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-12 12:20:36 +0800 |
| commit | e37ddf27108a992e191b27df9bd532cb9157dc89 (patch) | |
| tree | dd86e72414ae0b235679a992dfd408cc19fd2ab6 /kernel | |
| parent | 9ba733e2628196c5f211875122c8fc6de108c19e (diff) | |
| parent | 4c2795dd50f98fa162cb53190eb557be44f92f58 (diff) | |
Merge tag 'v4.4.10' into linux-linaro-lsk-v4.4
This is the 4.4.10 stable release
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_events.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index d202d991edae..996f0fd34312 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2107,8 +2107,13 @@ event_create_dir(struct dentry *parent, struct trace_event_file *file) trace_create_file("filter", 0644, file->dir, file, &ftrace_event_filter_fops); - trace_create_file("trigger", 0644, file->dir, file, - &event_trigger_fops); + /* + * Only event directories that can be enabled should have + * triggers. + */ + if (!(call->flags & TRACE_EVENT_FL_IGNORE_ENABLE)) + trace_create_file("trigger", 0644, file->dir, file, + &event_trigger_fops); trace_create_file("format", 0444, file->dir, call, &ftrace_event_format_fops); |