From: Steven Rostedt <[email protected]> The call to update_marker_trace() in set_tracer_flag() performs the update to the tr->trace_flags. There's no reason to perform it again after it is called. Return immediately instead.
Signed-off-by: Steven Rostedt (Google) <[email protected]> --- kernel/trace/trace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index dea1566b3301..07bd10808277 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5285,8 +5285,11 @@ int set_tracer_flag(struct trace_array *tr, u64 mask, int enabled) } } - if (mask == TRACE_ITER(COPY_MARKER)) + if (mask == TRACE_ITER(COPY_MARKER)) { update_marker_trace(tr, enabled); + /* update_marker_trace updates the tr->trace_flags */ + return 0; + } if (enabled) tr->trace_flags |= mask; -- 2.51.0
