diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-19 10:29:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-06-19 10:29:49 -0700 |
commit | e5b3efbe1ab1793bb49ae07d56d0973267e65112 (patch) | |
tree | b0f9b468f0de3ef4a2afa0faf1a819bc780175c1 /kernel | |
parent | 6785e3cc09f149c42ce70eb92736d68c0db64684 (diff) | |
parent | 3572bd5689b0812b161b40279e39ca5b66d73e88 (diff) | |
download | lwn-e5b3efbe1ab1793bb49ae07d56d0973267e65112.tar.gz lwn-e5b3efbe1ab1793bb49ae07d56d0973267e65112.zip |
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
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 166ad5444eea..721c3b221048 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -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. |