Merge branch 'linus' into tracing-v28-for-linus-v3

[linux-2.6-omap-h63xx.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 5ceff3249a2d84cd23110b99fb3f8a076e8cf56c..c258a41c8330f86e90a1fb319ef0ddbe3cee1320 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -779,6 +779,13 @@ config PROFILING
          Say Y here to enable the extended profiling support mechanisms used
          by profilers such as OProfile.
 
+#
+# Place an empty function call at each tracepoint site. Can be
+# dynamically changed for a probe function.
+#
+config TRACEPOINTS
+       bool
+
 config MARKERS
        bool "Activate markers"
        help