summaryrefslogtreecommitdiffstats
path: root/arch/s390/Kconfig
diff options
context:
space:
mode:
authorHeiko Carstens2008-02-19 15:29:25 +0100
committerMartin Schwidefsky2008-02-19 15:29:32 +0100
commit057c5cb35ece6ae3a4c2cb849f3948c5ad6add32 (patch)
treedf3998734a17130841723604cd9fe7514bad885e /arch/s390/Kconfig
parent[S390] cio: Do timed recovery on workqueue. (diff)
downloadkernel-qcow2-linux-057c5cb35ece6ae3a4c2cb849f3948c5ad6add32.tar.gz
kernel-qcow2-linux-057c5cb35ece6ae3a4c2cb849f3948c5ad6add32.tar.xz
kernel-qcow2-linux-057c5cb35ece6ae3a4c2cb849f3948c5ad6add32.zip
[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>
Diffstat (limited to 'arch/s390/Kconfig')
-rw-r--r--arch/s390/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 92a4f7b4323a..b21444b681b6 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