diff --git a/[refs] b/[refs]
index 0b336dcac82f..7c11d166d6b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29e71abf56cebc5c5a4e184a6eb4360cc58554ad
+refs/heads/master: e4b2b8866121bd06d5f3d9de0f79a04339ffa252
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index fc8351f374fd..5a34c5427a07 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -25,6 +25,7 @@ config X86
 	select HAVE_KPROBES
 	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select HAVE_KRETPROBES
+	select HAVE_FTRACE_MCOUNT_RECORD
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FTRACE
 	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)