From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 19 Feb 2008 14:29:25 +0000 (+0100)
Subject: [S390] Let NR_CPUS default to 32/64 on s390/s390x.
X-Git-Tag: v2.6.25-rc3~121^2~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=057c5cb35ece6ae3a4c2cb849f3948c5ad6add32;p=linux-2.6

[S390] Let NR_CPUS default to 32/64 on s390/s390x.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 92a4f7b432..b21444b681 100644
--- a/arch/s390/Kconfig
+++ b/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