diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:41 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:41 +0800 |
commit | 5cc3b58828a8bb2ebb34de96d1aec1564f912a31 (patch) | |
tree | 2694db57173168b3a222c25c3372cdef0b17924f /kernel/trace/trace_events.c | |
parent | c24745baffdb7143d6f345659fb6d781b070ca50 (diff) | |
parent | 7f30737678023b5becaf0e2e012665f71b886a7d (diff) |
Merge tag 'v4.1.20' into linux-linaro-lsk-v4.1lsk-v4.1-16.03
This is the 4.1.20 stable release
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 c4de47fc5cca..f69ec1295b0b 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -683,7 +683,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; } |