diff --git a/[refs] b/[refs]
index 015ee0251af3..49a7fee90710 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f14488ccfe0f41207e40520fab60dce356ed9e57
+refs/heads/master: 9690ad031290d86979b284bd6243313f58271bcc
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 48e496fe1e75..a36b014ee662 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -21,6 +21,7 @@ config IA64
 	select HAVE_KRETPROBES
 	select HAVE_DMA_ATTRS
 	select HAVE_KVM
+	select HAVE_ARCH_TRACEHOOK
 	default y
 	help
 	  The Itanium Processor Family is Intel's 64-bit successor to