diff --git a/[refs] b/[refs]
index 9206144dcf53..d67a32d7705b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c5119c1e655e0719a69601b1049acdd5ec1c125
+refs/heads/master: 4d7a077c0c7bfdba04cf0aa0b79053cf4ebaacf8
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index 58a93fbd68aa..34e707e5ab87 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -52,6 +52,7 @@ config FUNCTION_TRACER
 	depends on HAVE_FUNCTION_TRACER
 	depends on DEBUG_KERNEL
 	select FRAME_POINTER
+	select KALLSYMS
 	select TRACING
 	select CONTEXT_SWITCH_TRACER
 	help
@@ -238,6 +239,7 @@ config STACK_TRACER
 	depends on DEBUG_KERNEL
 	select FUNCTION_TRACER
 	select STACKTRACE
+	select KALLSYMS
 	help
 	  This special tracer records the maximum stack footprint of the
 	  kernel and displays it in debugfs/tracing/stack_trace.