Commit e5b3efbe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'probes-fixes-v6.10-rc4' of... 

Merge tag 'probes-fixes-v6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull probes fix from Masami Hiramatsu:

 - Restrict gen-API tests for synthetic and kprobe events to only be
   built as modules, as they generate dynamic events that cannot be
   removed, causing ftracetest and startup selftests to fail

* tag 'probes-fixes-v6.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: Build event generation tests only as modules
parents 6785e3cc 3572bd56

kernel/trace/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ config PREEMPTIRQ_DELAY_TEST 


config SYNTH_EVENT_GEN_TEST

	tristate "Test module for in-kernel synthetic event generation"

	depends on SYNTH_EVENTS

	depends on SYNTH_EVENTS && m

	help

          This option creates a test module to check the base

          functionality of in-kernel synthetic event definition and
@@ -1149,7 +1149,7 @@ config SYNTH_EVENT_GEN_TEST 


config KPROBE_EVENT_GEN_TEST

	tristate "Test module for in-kernel kprobe event generation"

	depends on KPROBE_EVENTS

	depends on KPROBE_EVENTS && m

	help

          This option creates a test module to check the base

          functionality of in-kernel kprobe event definition.