Skip to content

Commit e5b3efb

Browse files
committed
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
2 parents 6785e3c + 3572bd5 commit e5b3efb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/trace/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,7 +1136,7 @@ config PREEMPTIRQ_DELAY_TEST
11361136

11371137
config SYNTH_EVENT_GEN_TEST
11381138
tristate "Test module for in-kernel synthetic event generation"
1139-
depends on SYNTH_EVENTS
1139+
depends on SYNTH_EVENTS && m
11401140
help
11411141
This option creates a test module to check the base
11421142
functionality of in-kernel synthetic event definition and
@@ -1149,7 +1149,7 @@ config SYNTH_EVENT_GEN_TEST
11491149

11501150
config KPROBE_EVENT_GEN_TEST
11511151
tristate "Test module for in-kernel kprobe event generation"
1152-
depends on KPROBE_EVENTS
1152+
depends on KPROBE_EVENTS && m
11531153
help
11541154
This option creates a test module to check the base
11551155
functionality of in-kernel kprobe event definition.

0 commit comments

Comments
 (0)