diff --git a/[refs] b/[refs]
index ad3eb60689cb..832ffa553822 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59e52130f04537d2c80ea44bb007cadd1ad29543
+refs/heads/master: 99bbc4b1e677ac695431e8d9c8e710ef391c567f
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index b6fa2877b173..f463a8a3b21f 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -30,6 +30,7 @@ config X86
 	select HAVE_FTRACE
 	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
 	select HAVE_ARCH_KGDB if !X86_VOYAGER
+	select HAVE_ARCH_TRACEHOOK
 	select HAVE_EFFICIENT_UNALIGNED_ACCESS
 
 config ARCH_DEFCONFIG