summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorXose Vazquez Perez <xose.vazquez@gmail.com>2013-11-29 16:33:02 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-12-02 15:31:08 +0100
commit8cb04be88656ad20ba7cb017726c73b7f33796fb (patch)
treed42372931da99fb02d71192f99f1610d3a0974f8 /arch/s390
parent9c0952344d732ec47d05653d471c720bce112fcd (diff)
downloadblackbird-op-linux-8cb04be88656ad20ba7cb017726c73b7f33796fb.tar.gz
blackbird-op-linux-8cb04be88656ad20ba7cb017726c73b7f33796fb.zip
s390: increase CONFIG_NR_CPUS limit
In current models, maximum number of active cores is 101. [heiko.carstens@de.ibm.com]: Xose's patch increased the maximum possible value of CONFIG_NR_CPUS to 101. I changed this to 256 instead. Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 5877e71901b3..1e1a03d2d19f 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -347,14 +347,14 @@ config SMP
Even if you don't know what to do here, say Y.
config NR_CPUS
- int "Maximum number of CPUs (2-64)"
- range 2 64
+ int "Maximum number of CPUs (2-256)"
+ range 2 256
depends on SMP
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
+ kernel will support. The maximum supported value is 256 and the
minimum value which makes sense is 2.
This is purely to save memory - each supported CPU adds
OpenPOWER on IntegriCloud