summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorXiao Yang <yangx.jy@cn.fujitsu.com>2020-04-05 03:44:57 +0200
committerShuah Khan <skhan@linuxfoundation.org>2020-04-14 18:00:29 +0200
commitcdfe56d9012bcff266880177c4c7caf9821f63b0 (patch)
treee4c86284d6a160b6177afa89d147c3bf84837cb3 /tools
parentselftests/seccomp: allow clock_nanosleep instead of nanosleep (diff)
downloadlinux-cdfe56d9012bcff266880177c4c7caf9821f63b0.tar.xz
linux-cdfe56d9012bcff266880177c4c7caf9821f63b0.zip
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/ftrace/config1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/ftrace/config b/tools/testing/selftests/ftrace/config
index c2c8de4fafff..e59d985eeff0 100644
--- a/tools/testing/selftests/ftrace/config
+++ b/tools/testing/selftests/ftrace/config
@@ -11,5 +11,6 @@ CONFIG_PREEMPTIRQ_DELAY_TEST=m
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_SAMPLES=y
+CONFIG_SAMPLE_FTRACE_DIRECT=m
CONFIG_SAMPLE_TRACE_PRINTK=m
CONFIG_KALLSYMS_ALL=y