diff --git a/[refs] b/[refs]
index 475f87c66578..c5acd96ac5e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb4f87a2f048b4cb1a499c9baa78f1d8437b09c3
+refs/heads/master: 3231739d97b348c628a10fb49adfa9143e1de28b
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 434183eb4f12..f995d134ab3a 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -23,6 +23,7 @@ config SUPERH32
 	def_bool !SUPERH64
 	select HAVE_KPROBES
 	select HAVE_KRETPROBES
+	select HAVE_ARCH_TRACEHOOK if (!SH_FPU && !SH_DSP)
 
 config SUPERH64
 	def_bool y if CPU_SH5