commit cdfe56d9012bcff266880177c4c7caf9821f63b0
author Xiao Yang <yangx.jy@cn.fujitsu.com> Sun Apr 05 09:44:57 2020 +0800
committer Shuah Khan <skhan@linuxfoundation.org> Tue Apr 14 10:00:29 2020 -0600
tree e4c86284d6a160b6177afa89d147c3bf84837cb3
parent d42b8dbec46c08c6bd3f9d264127bd4910581c07

selftests/ftrace: Add CONFIG_SAMPLE_FTRACE_DIRECT=m kconfig

ftrace-direct.tc and kprobe-direct.tc require CONFIG_SAMPLE_FTRACE_DIRECT=m
so add it to config file which is used by merge_config.sh.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

tools/testing/selftests/ftrace/config

diff --git a/tools/testing/selftests/ftrace/config b/tools/testing/selftests/ftrace/config
index c2c8de4..e59d985 100644
--- a/tools/testing/selftests/ftrace/config
+++ b/tools/testing/selftests/ftrace/config
@@ -11,5 +11,6 @@
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_SAMPLES=y
+CONFIG_SAMPLE_FTRACE_DIRECT=m
 CONFIG_SAMPLE_TRACE_PRINTK=m
 CONFIG_KALLSYMS_ALL=y