diff --git a/[refs] b/[refs]
index 936be7d63f16..45d08b09c664 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c629727cefe45abb2f7459836bfc4b41c5e55ba
+refs/heads/master: 057c5cb35ece6ae3a4c2cb849f3948c5ad6add32
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 92a4f7b4323a..b21444b681b6 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -100,7 +100,8 @@ config NR_CPUS
 	int "Maximum number of CPUs (2-64)"
 	range 2 64
 	depends on SMP
-	default "32"
+	default "32" if !64BIT
+	default "64" if 64BIT
 	help
 	  This allows you to specify the maximum number of CPUs which this
 	  kernel will support.  The maximum supported value is 64 and the