diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:50 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:50 +0800 |
| commit | 864b6e70253ae07b58bb126d29a35be22f50f453 (patch) | |
| tree | 21f2021685284c01035f1cf03c1ff0b3c66da008 /kernel/trace/trace_events.c | |
| parent | 405b4c1452cb59ce07632a60d3e3152ab9243ae6 (diff) | |
| parent | 421a8ddd1fc901897eee73965b442af4b4dd7095 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.03-android
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 1b0df1e504f0..b6cd1b653e21 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -644,7 +644,8 @@ t_next(struct seq_file *m, void *v, loff_t *pos) * The ftrace subsystem is for showing formats only. * They can not be enabled or disabled via the event files. */ - if (call->class && call->class->reg) + if (call->class && call->class->reg && + !(call->flags & TRACE_EVENT_FL_IGNORE_ENABLE)) return file; } |