diff --git a/[refs] b/[refs]
index 29547de1263d..87dccf673ced 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec6743bb06510c7b629603ce35713d6ae9273579
+refs/heads/master: becf91f18750cf1c60828aa2ee63a36b05c2e4d0
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index e04b8bcdef88..ea37e2ff4164 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -126,7 +126,7 @@ if FTRACE
 config FUNCTION_TRACER
 	bool "Kernel Function Tracer"
 	depends on HAVE_FUNCTION_TRACER
-	select FRAME_POINTER if (!ARM_UNWIND)
+	select FRAME_POINTER if !ARM_UNWIND && !S390
 	select KALLSYMS
 	select GENERIC_TRACER
 	select CONTEXT_SWITCH_TRACER