diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:17:46 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:17:46 +0800 |
| commit | b5db8c3eefa4d7b7ca7934610356969fa1a4547b (patch) | |
| tree | fb2cc37b4da4b4611eb9920789a130a6c41af1e7 /kernel/trace/trace_events.c | |
| parent | 14c737514d0953f05e91103c05e975b3b5c1e469 (diff) | |
| parent | 6c1be3bf831c5b1f2ba51425315287df2c350633 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.05-android
Diffstat (limited to 'kernel/trace/trace_events.c')
| -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 b6cd1b653e21..51c47bc832d4 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -1584,8 +1584,13 @@ event_create_dir(struct dentry *parent, struct ftrace_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); |