1 files changed, 34 insertions, 1 deletions

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 2ad39e556cb..93168c0f991 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -82,7 +82,7 @@ config EVENT_POWER_TRACING_DEPRECATED
           power:power_frequency
           This is for userspace compatibility
           and will vanish after 5 kernel iterations,
-          namely 2.6.41.
+          namely 3.1.
 
 config CONTEXT_SWITCH_TRACER
         bool
@@ -487,6 +487,39 @@ config RING_BUFFER_BENCHMARK
 
           If unsure, say N.
 
+config TRACELEVEL
+        bool "Add capability to prioritize traces"
+        depends on EVENT_TRACING
+        help
+          This option allows subsystem programmers to add priorities to trace
+          events by calling to tracelevel_register. Traces of high priority
+          will automatically be enabled on kernel boot, and users can change
+          the the trace level in a kernel parameter.
+
+config TRACEDUMP
+        bool "Dumping functionality for ftrace"
+        depends on FUNCTION_TRACER
+        help
+          This option adds functionality to dump tracing data in several forms
+          Data can be dumped in ascii form or as raw pages from the tracing
+          ring buffers, along with the saved cmdlines. This is specified by
+          the module parameter tracedump_ascii. Data will be compressed
+          using zlib.
+
+config TRACEDUMP_PANIC
+        bool "Tracedump to console on panic"
+        depends on TRACEDUMP
+        help
+          With this option, tracedump will automatically dump to the console
+          on a kernel panic.
+
+config TRACEDUMP_PROCFS
+        bool "Tracedump via proc file"
+        depends on TRACEDUMP
+        help
+          With this option, tracedump can be dumped from user space by reading
+          from /proc/tracedump.
+
 endif # FTRACE
 
 endif # TRACING_SUPPORT