diff --git a/[refs] b/[refs]
index 427f229b311c..cc613a080325 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faa582ca8014d2e1ede5568a813fb0e5c3c078df
+refs/heads/master: 684de39bd7957bfb1657a13ccb0c53a474708f2f
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 9892827b6176..1831833c430e 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -351,6 +351,10 @@ endchoice
 
 source "fs/Kconfig.binfmt"
 
+config FORCE_MAX_ZONEORDER
+	int
+	default "9"
+
 config PROCESS_DEBUG
 	bool "Show crashed user process info"
 	help