Merge branch 'linus' into x86/urgent

[linux-2.6] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index eb1988ed84b714cec5201fc5cec7dc585e1ab56f..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
 
@@ -14,7 +17,7 @@ config TRACING
 
 config FTRACE
        bool "Kernel Function Tracer"
-       depends on DEBUG_KERNEL && HAVE_FTRACE
+       depends on HAVE_FTRACE
        select FRAME_POINTER
        select TRACING
        select CONTEXT_SWITCH_TRACER
@@ -32,6 +35,7 @@ config IRQSOFF_TRACER
        default n
        depends on TRACE_IRQFLAGS_SUPPORT
        depends on GENERIC_TIME
+       depends on HAVE_FTRACE
        select TRACE_IRQFLAGS
        select TRACING
        select TRACER_MAX_TRACE
@@ -54,6 +58,7 @@ config PREEMPT_TRACER
        default n
        depends on GENERIC_TIME
        depends on PREEMPT
+       depends on HAVE_FTRACE
        select TRACING
        select TRACER_MAX_TRACE
        help
@@ -70,9 +75,17 @@ 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 DEBUG_KERNEL
+       depends on HAVE_FTRACE
        select TRACING
        select CONTEXT_SWITCH_TRACER
        select TRACER_MAX_TRACE
@@ -82,7 +95,7 @@ config SCHED_TRACER
 
 config CONTEXT_SWITCH_TRACER
        bool "Trace process context switches"
-       depends on DEBUG_KERNEL
+       depends on HAVE_FTRACE
        select TRACING
        select MARKERS
        help
@@ -92,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