Merge tag 'hwmon-for-v7.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

[linux.git] / kernel / trace / trace_functions.c

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index f283391a4dc80d17e57e7252d9afc5617b66a751..cd37f201375813715464a429fe6ef668d204d8fb 100644 (file)
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -458,12 +458,12 @@ func_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set)
        ftrace_func_t func;
        u32 new_flags;
 
-       /* Do nothing if already set. */
-       if (!!set == !!(tr->current_trace_flags->val & bit))
+       /* We can change this flag only when current tracer is function. */
+       if (tr->current_trace != &function_trace)
                return 0;
 
-       /* We can change this flag only when not running. */
-       if (tr->current_trace != &function_trace)
+       /* Do nothing if already set. */
+       if (!!set == !!(tr->current_trace_flags->val & bit))
                return 0;
 
        new_flags = (tr->current_trace_flags->val & ~bit) | (set ? bit : 0);