aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init/Kconfig9
-rw-r--r--kernel/trace/Kconfig1
2 files changed, 6 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig
index d5994490b0b0..031344f954fd 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -771,11 +771,12 @@ config PROFILING
771 Say Y here to enable the extended profiling support mechanisms used 771 Say Y here to enable the extended profiling support mechanisms used
772 by profilers such as OProfile. 772 by profilers such as OProfile.
773 773
774#
775# Place an empty function call at each tracepoint site. Can be
776# dynamically changed for a probe function.
777#
774config TRACEPOINTS 778config TRACEPOINTS
775 bool "Activate tracepoints" 779 bool
776 help
777 Place an empty function call at each tracepoint site. Can be
778 dynamically changed for a probe function.
779 780
780config MARKERS 781config MARKERS
781 bool "Activate markers" 782 bool "Activate markers"
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 263e9e6bbd60..cae2637d5e68 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -14,6 +14,7 @@ config TRACING
14 bool 14 bool
15 select DEBUG_FS 15 select DEBUG_FS
16 select STACKTRACE 16 select STACKTRACE
17 select TRACEPOINTS
17 18
18config FTRACE 19config FTRACE
19 bool "Kernel Function Tracer" 20 bool "Kernel Function Tracer"