Skip to content

Commit c5229a0

Browse files
chleroyrostedt
authored andcommitted
tracing: Fix selftest config check for function graph start up test
CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS is required to test direct tramp. Link: https://lkml.kernel.org/r/bdc7e594e13b0891c1d61bc8d56c94b1890eaed7.1640017960.git.christophe.leroy@csgroup.eu Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 851e99e commit c5229a0

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

kernel/trace/trace_selftest.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -784,9 +784,7 @@ static struct fgraph_ops fgraph_ops __initdata = {
784784
.retfunc = &trace_graph_return,
785785
};
786786

787-
#if defined(CONFIG_DYNAMIC_FTRACE) && \
788-
defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS)
789-
#define TEST_DIRECT_TRAMP
787+
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
790788
noinline __noclone static void trace_direct_tramp(void) { }
791789
#endif
792790

@@ -849,7 +847,7 @@ trace_selftest_startup_function_graph(struct tracer *trace,
849847
goto out;
850848
}
851849

852-
#ifdef TEST_DIRECT_TRAMP
850+
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
853851
tracing_reset_online_cpus(&tr->array_buffer);
854852
set_graph_array(tr);
855853

0 commit comments

Comments
 (0)