Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes

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

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index f3005717bcd0ca3d7b4638ea92aedc8194dce636..263e9e6bbd60912132ba18077c0fa0d66d7e1ffb 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -4,6 +4,9 @@
 config HAVE_FTRACE
        bool
 
+config HAVE_DYNAMIC_FTRACE
+       bool
+
 config TRACER_MAX_TRACE
        bool
 
@@ -72,6 +75,14 @@ config PREEMPT_TRACER
          enabled. This option and the irqs-off timing option can be
          used together or separately.)
 
+config SYSPROF_TRACER
+       bool "Sysprof Tracer"
+       depends on X86
+       select TRACING
+       help
+         This tracer provides the trace needed by the 'Sysprof' userspace
+         tool.
+
 config SCHED_TRACER
        bool "Scheduling Latency Tracer"
        depends on HAVE_FTRACE
@@ -94,6 +105,7 @@ config CONTEXT_SWITCH_TRACER
 config DYNAMIC_FTRACE
        bool "enable/disable ftrace tracepoints dynamically"
        depends on FTRACE
+       depends on HAVE_DYNAMIC_FTRACE
        default y
        help
          This option will modify all the calls to ftrace dynamically