]> git.baikalelectronics.ru Git - kernel.git/commit
ftrace/samples: add missing Kconfig option for ftrace direct multi sample
authorHeiko Carstens <hca@linux.ibm.com>
Mon, 15 Nov 2021 19:56:13 +0000 (20:56 +0100)
committerHeiko Carstens <hca@linux.ibm.com>
Thu, 18 Nov 2021 16:50:54 +0000 (17:50 +0100)
commit8f3cd9d4aaa925217908c267d437ccb33b765c9b
tree08964e405f2a5daf46db6c1a43c01b4494ab202f
parenta8937f0c4c6c12929c1d2150f11a0fc7d5a047ab
ftrace/samples: add missing Kconfig option for ftrace direct multi sample

Currently it is not possible to build the ftrace direct multi example
anymore due to broken config dependencies. Fix this by adding
SAMPLE_FTRACE_DIRECT_MULTI config option.

This broke when merging s390-5.16-1 due to an incorrect merge conflict
resolution proposed by me.

Also rename SAMPLE_FTRACE_MULTI_DIRECT to SAMPLE_FTRACE_DIRECT_MULTI
so it matches the module name.

Fixes: c09a55afe3f2 ("Merge tag 's390-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux")
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Link: https://lore.kernel.org/r/20211115195614.3173346-2-hca@linux.ibm.com
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
arch/x86/Kconfig
samples/Kconfig
samples/Makefile
samples/ftrace/Makefile