Merge commit 'linus/master' into tracing/kprobes

[mv-sheeva.git] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index e71634604400c6dd5bb9f7e0a019143ae9c7cc32..15372a9f23999c80c12cb118b0a2b1f50f73763a 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -83,7 +83,7 @@ config RING_BUFFER_ALLOW_SWAP
 # This allows those options to appear when no other tracer is selected. But the
 # options do not appear when something else selects it. We need the two options
 # GENERIC_TRACER and TRACING to avoid circular dependencies to accomplish the
-# hidding of the automatic options options.
+# hidding of the automatic options.
 
 config TRACING
        bool
@@ -428,6 +428,18 @@ config BLK_DEV_IO_TRACE
 
          If unsure, say N.
 
+config KPROBE_TRACER
+       depends on KPROBES
+       depends on X86
+       bool "Trace kprobes"
+       select TRACING
+       select GENERIC_TRACER
+       help
+         This tracer probes everywhere where kprobes can probe it, and
+         records various registers and memories specified by user.
+         This also allows you to trace kprobe probe points as a dynamic
+         defined events. It provides per-probe event filtering interface.
+
 config DYNAMIC_FTRACE
        bool "enable/disable ftrace tracepoints dynamically"
        depends on FUNCTION_TRACER