aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-03-18 12:01:48 +0800
committerAlex Shi <alex.shi@linaro.org>2016-03-18 12:01:48 +0800
commit421a8ddd1fc901897eee73965b442af4b4dd7095 (patch)
treee9bd7aef46f35c1857700b9c52ad24f6a68f957c /kernel
parent82211c838b558293e48c8fcd816f6609ebc7e4b3 (diff)
parentd439e869d612dd7a338ac75a4afc3646a5e67370 (diff)
downloadlinux-linaro-stable-421a8ddd1fc901897eee73965b442af4b4dd7095.tar.gz
Merge tag 'v3.18.29' into linux-linaro-lsk-v3.18lsk-v3.18-16.03
This is the 3.18.29 stable release
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_events.c3
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;
}