diff --git a/[refs] b/[refs]
index fa9d0924607c..68762c96bf79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6bf81ef0f7474434c2a049e8bf3c9146a14dd96
+refs/heads/master: 65b77242043f74bca6a0d733c0e48ef03a8c9893
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index 50f62a296e1d..f61be3015783 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -79,6 +79,7 @@ if TRACING_SUPPORT
 
 menuconfig FTRACE
 	bool "Tracers"
+	default y if DEBUG_KERNEL
 	help
 	 Enable the kernel tracing infrastructure.