diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-21 17:08:07 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-21 17:08:07 +0000 |
| commit | c35983d487b56c023b70d6727ad002b19f935827 (patch) | |
| tree | 06b6b8ad506084442a3a0f46dbde6789fd78e358 /kernel/trace/trace_events.c | |
| parent | bb19a07897898f424c62b4456ba100fd38cfa679 (diff) | |
| parent | 412f52dbad2603a77f26f0337ae03800e39504f0 (diff) | |
Merge tag 'v4.4.4-rt11' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel into linux-linaro-lsk-v4.4-rt
v4.4.4-rt11
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 878cf6525a0d..9273af5ad3b2 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -871,7 +871,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; } |