1 files changed, 34 insertions, 8 deletions

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 9cbf7761f498..bde6f03512d5 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -12,7 +12,7 @@ config NOP_TRACER
 config HAVE_FUNCTION_TRACER
         bool
 
-config HAVE_FUNCTION_RET_TRACER
+config HAVE_FUNCTION_GRAPH_TRACER
         bool
 
 config HAVE_FUNCTION_TRACE_MCOUNT_TEST
@@ -28,6 +28,9 @@ config HAVE_DYNAMIC_FTRACE
 config HAVE_FTRACE_MCOUNT_RECORD
         bool
 
+config HAVE_HW_BRANCH_TRACER
+        bool
+
 config TRACER_MAX_TRACE
         bool
 
@@ -60,15 +63,19 @@ config FUNCTION_TRACER
           (the bootup default), then the overhead of the instructions is very
           small and not measurable even in micro-benchmarks.
 
-config FUNCTION_RET_TRACER
-        bool "Kernel Function return Tracer"
-        depends on HAVE_FUNCTION_RET_TRACER
+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 its return.
-          It's first purpose is to trace the duration of functions.
-          This is done by setting the current return address on the thread
-          info structure of the current task.
+          Enable the kernel to trace a function at both its return
+          and its entry.
+          It's first purpose is to trace the duration of functions and
+          draw a call graph for each thread with some informations like
+          the return value.
+          This is done by setting the current return address on the current
+          task structure into a stack of calls.
 
 config IRQSOFF_TRACER
         bool "Interrupts-off Latency Tracer"
@@ -214,6 +221,17 @@ config BRANCH_TRACER
 
           Say N if unsure.
 
+config POWER_TRACER
+        bool "Trace power consumption behavior"
+        depends on DEBUG_KERNEL
+        depends on X86
+        select TRACING
+        help
+          This tracer helps developers to analyze and optimize the kernels
+          power management decisions, specifically the C-state and P-state
+          behavior.
+
+
 config STACK_TRACER
         bool "Trace max stack"
         depends on HAVE_FUNCTION_TRACER
@@ -233,6 +251,14 @@ config STACK_TRACER
 
           Say N if unsure.
 
+config BTS_TRACER
+        depends on HAVE_HW_BRANCH_TRACER
+        bool "Trace branches"
+        select TRACING
+        help
+          This tracer records all branches on the system in a circular
+          buffer giving access to the last N branches for each cpu.
+
 config DYNAMIC_FTRACE
         bool "enable/disable ftrace tracepoints dynamically"
         depends on FUNCTION_TRACER