diff --git a/[refs] b/[refs]
index 56c6c96e7ee6..3f1b30414d85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b6cced6ec9677fa65471e890dfdcb4bf5387643
+refs/heads/master: 2ff01c6a17391225a18256d510b6e5b4aba40aa1
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index 2a22e46390d3..5a9cffb0fafb 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -109,6 +109,7 @@ config CONTEXT_SWITCH_TRACER
 config STACK_TRACER
 	bool "Trace max stack"
 	depends on HAVE_FTRACE
+	depends on DEBUG_KERNEL
 	select FTRACE
 	select STACKTRACE
 	help