summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorChunyu Hu <chuhu@redhat.com>2017-09-05 13:36:46 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-09-27 14:43:19 +0200
commite614cf2a30dbd4cc1aa53a801fbc03bbb82a8a87 (patch)
tree897df5574be35eae236357641237e667af678b5d /kernel
parent735fb2caa46a32f0ed9d16df785ee242ca9e3bc3 (diff)
downloadtalos-op-linux-e614cf2a30dbd4cc1aa53a801fbc03bbb82a8a87.tar.gz
talos-op-linux-e614cf2a30dbd4cc1aa53a801fbc03bbb82a8a87.zip
tracing: Fix clear of RECORDED_TGID flag when disabling trace event
commit 7685ab6c58557c6234f3540260195ecbee7fc4b3 upstream. When disabling one trace event, the RECORDED_TGID flag in the event file is not correctly cleared. It's clearing RECORDED_CMD flag when it should clear RECORDED_TGID flag. Link: http://lkml.kernel.org/r/1504589806-8425-1-git-send-email-chuhu@redhat.com Cc: Joel Fernandes <joelaf@google.com> Fixes: d914ba37d7 ("tracing: Add support for recording tgid of tasks") Signed-off-by: Chunyu Hu <chuhu@redhat.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_events.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 36132f9280e6..51a6e09a7410 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -406,7 +406,7 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
if (file->flags & EVENT_FILE_FL_RECORDED_TGID) {
tracing_stop_tgid_record();
- clear_bit(EVENT_FILE_FL_RECORDED_CMD_BIT, &file->flags);
+ clear_bit(EVENT_FILE_FL_RECORDED_TGID_BIT, &file->flags);
}
call->class->reg(call, TRACE_REG_UNREGISTER, file);
OpenPOWER on IntegriCloud