Commit 503e4510 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

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: 0b707e57 ("Merge tag 's390-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux"

)
Acked-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Link: https://lore.kernel.org/r/20211115195614.3173346-2-hca@linux.ibm.com


Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent f1ab2e0d

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ config X86 
	select HAVE_DYNAMIC_FTRACE_WITH_ARGS	if X86_64

	select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS

	select HAVE_SAMPLE_FTRACE_DIRECT	if X86_64

	select HAVE_SAMPLE_FTRACE_MULTI_DIRECT	if X86_64

	select HAVE_SAMPLE_FTRACE_DIRECT_MULTI	if X86_64

	select HAVE_EBPF_JIT

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_EISA

samples/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -31,6 +31,15 @@ config SAMPLE_FTRACE_DIRECT 
	  This builds an ftrace direct function example

	  that hooks to wake_up_process and prints the parameters.



config SAMPLE_FTRACE_DIRECT_MULTI

	tristate "Build register_ftrace_direct_multi() example"

	depends on DYNAMIC_FTRACE_WITH_DIRECT_CALLS && m

	depends on HAVE_SAMPLE_FTRACE_DIRECT_MULTI

	help

	  This builds an ftrace direct function example

	  that hooks to wake_up_process and schedule, and prints

	  the function addresses.



config SAMPLE_TRACE_ARRAY

        tristate "Build sample module for kernel access to Ftrace instancess"

	depends on EVENT_TRACING && m
@@ -237,5 +246,5 @@ endif # SAMPLES 
config HAVE_SAMPLE_FTRACE_DIRECT

	bool



config HAVE_SAMPLE_FTRACE_MULTI_DIRECT

config HAVE_SAMPLE_FTRACE_DIRECT_MULTI

	bool

samples/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ subdir-$(CONFIG_SAMPLE_TIMER) += timers 
obj-$(CONFIG_SAMPLE_TRACE_EVENTS)	+= trace_events/

obj-$(CONFIG_SAMPLE_TRACE_PRINTK)	+= trace_printk/

obj-$(CONFIG_SAMPLE_FTRACE_DIRECT)	+= ftrace/

obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace/

obj-$(CONFIG_SAMPLE_FTRACE_DIRECT_MULTI) += ftrace/

obj-$(CONFIG_SAMPLE_TRACE_ARRAY)	+= ftrace/

subdir-$(CONFIG_SAMPLE_UHID)		+= uhid

obj-$(CONFIG_VIDEO_PCI_SKELETON)	+= v4l/

samples/ftrace/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct.o

obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-too.o

obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-modify.o

obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace-direct-multi.o

obj-$(CONFIG_SAMPLE_FTRACE_DIRECT_MULTI) += ftrace-direct-multi.o



CFLAGS_sample-trace-array.o := -I$(src)

obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += sample-trace-array.o