diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-02-19 15:29:25 +0100 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-02-19 15:29:32 +0100 |
commit | 057c5cb35ece6ae3a4c2cb849f3948c5ad6add32 (patch) | |
tree | df3998734a17130841723604cd9fe7514bad885e /arch | |
parent | 4c629727cefe45abb2f7459836bfc4b41c5e55ba (diff) | |
download | kernel_samsung_aries-057c5cb35ece6ae3a4c2cb849f3948c5ad6add32.zip kernel_samsung_aries-057c5cb35ece6ae3a4c2cb849f3948c5ad6add32.tar.gz kernel_samsung_aries-057c5cb35ece6ae3a4c2cb849f3948c5ad6add32.tar.bz2 |
[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')
-rw-r--r-- | arch/s390/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 92a4f7b..b21444b 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 |