Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 7 insertions, 10 deletions

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 69ebf3c2f1b5..78af97163147 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -137,6 +137,13 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)
         if (trace_recursion_test(TRACE_GRAPH_NOTRACE_BIT))
                 return 0;
 
+        /*
+         * Do not trace a function if it's filtered by set_graph_notrace.
+         * Make the index of ret stack negative to indicate that it should
+         * ignore further functions.  But it needs its own ret stack entry
+         * to recover the original index in order to continue tracing after
+         * returning from the function.
+         */
         if (ftrace_graph_notrace_addr(trace->func)) {
                 trace_recursion_set(TRACE_GRAPH_NOTRACE_BIT);
                 /*
@@ -156,16 +163,6 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)
                 return 0;
 
         /*
-         * Do not trace a function if it's filtered by set_graph_notrace.
-         * Make the index of ret stack negative to indicate that it should
-         * ignore further functions.  But it needs its own ret stack entry
-         * to recover the original index in order to continue tracing after
-         * returning from the function.
-         */
-        if (ftrace_graph_notrace_addr(trace->func))
-                return 1;
-
-        /*
          * Stop here if tracing_threshold is set. We only write function return
          * events to the ring buffer.
          */