Make irq_*_affinity depend on CONFIG_GENERIC_HARDIRQS too.

[safe/jmp/linux-2.6] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 8b6b673..e2a4ff6 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -67,6 +67,7 @@ config FUNCTION_GRAPH_TRACER
        bool "Kernel Function Graph Tracer"
        depends on HAVE_FUNCTION_GRAPH_TRACER
        depends on FUNCTION_TRACER
+       default y
        help
          Enable the kernel to trace a function at both its return
          and its entry.
@@ -243,16 +244,21 @@ config STACK_TRACER
 
          This tracer works by hooking into every function call that the
          kernel executes, and keeping a maximum stack depth value and
-         stack-trace saved. Because this logic has to execute in every
-         kernel function, all the time, this option can slow down the
-         kernel measurably and is generally intended for kernel
-         developers only.
+         stack-trace saved.  If this is configured with DYNAMIC_FTRACE
+         then it will not have any overhead while the stack tracer
+         is disabled.
+
+         To enable the stack tracer on bootup, pass in 'stacktrace'
+         on the kernel command line.
+
+         The stack tracer can also be enabled or disabled via the
+         sysctl kernel.stack_tracer_enabled
 
          Say N if unsure.
 
-config BTS_TRACER
+config HW_BRANCH_TRACER
        depends on HAVE_HW_BRANCH_TRACER
-       bool "Trace branches"
+       bool "Trace hw branches"
        select TRACING
        help
          This tracer records all branches on the system in a circular