---

yaml --- r: 85897 b: refs/heads/master c: 057c5cb h: refs/heads/master i: 85895: 7a0efd6 v: v3
git-mirror · Feb 19, 2008 · 195c4eb · 195c4eb
1 parent 84e3949
commit 195c4eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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