diff --git a/[refs] b/[refs]
index 2a951370a0d1..f7e1c5330d54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5075baca2e95840d76210c3cfda56134007462c9
+refs/heads/master: fca3e357d5de31e484c3e0ec7f356e4fc488eb7f
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index e577839f3073..4cd12b5202af 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -96,6 +96,10 @@ config S390
 	select INIT_ALL_POSSIBLE
 	select HAVE_PERF_COUNTERS
 
+config SCHED_OMIT_FRAME_POINTER
+	bool
+	default y
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"