Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[linux-2.6-block.git] / kernel / trace / Kconfig

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 40fef552f01254da65afca692e6d4cd0fe5cc934..13e13d428cd37b96ca144b733c4c98fa4c7f257d 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -27,9 +27,7 @@ config HAVE_FUNCTION_GRAPH_TRACER
 config HAVE_FUNCTION_GRAPH_FP_TEST
        bool
        help
-        An arch may pass in a unique value (frame pointer) to both the
-        entering and exiting of a function. On exit, the value is compared
-        and if it does not match, then it will panic the kernel.
+         See Documentation/trace/ftrace-design.txt
 
 config HAVE_FUNCTION_TRACE_MCOUNT_TEST
        bool
@@ -330,15 +328,6 @@ config BRANCH_TRACER
 
          Say N if unsure.
 
-config POWER_TRACER
-       bool "Trace power consumption behavior"
-       depends on X86
-       select GENERIC_TRACER
-       help
-         This tracer helps developers to analyze and optimize the kernel's
-         power management decisions, specifically the C-state and P-state
-         behavior.
-
 config KSYM_TRACER
        bool "Trace read and write access on kernel memory locations"
        depends on HAVE_HW_BREAKPOINT