Commit f5ace166 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Kconfig: use range for NR_CPUS

From: Adrian Bunk <bunk@fs.tum.de>

The 2.6 Kconfig language allows to set the range for integer questions.

The patch below adds a range line on all architectures that have a
NR_CPUS question except ia64.

The help text on ia64 didn't suggest any values. Could someone tell the 
correct values for ia64 (and if it's only a minimum value of 2)?
parent 9a7d8a46
...@@ -509,6 +509,7 @@ config HAVE_DEC_LOCK ...@@ -509,6 +509,7 @@ config HAVE_DEC_LOCK
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-64)" int "Maximum number of CPUs (2-64)"
range 2 64
depends on SMP depends on SMP
default "64" default "64"
......
...@@ -447,6 +447,7 @@ config SMP ...@@ -447,6 +447,7 @@ config SMP
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-255)" int "Maximum number of CPUs (2-255)"
range 2 255
depends on SMP depends on SMP
default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
default "8" default "8"
......
...@@ -405,7 +405,8 @@ config EFI_VARS ...@@ -405,7 +405,8 @@ config EFI_VARS
support" (CONFIG_PROC_FS) is enabled, too. support" (CONFIG_PROC_FS) is enabled, too.
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs" int "Maximum number of CPUs (2-512)"
range 2 512
depends on SMP depends on SMP
default "64" default "64"
help help
......
...@@ -981,6 +981,7 @@ config SMP ...@@ -981,6 +981,7 @@ config SMP
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-32)" int "Maximum number of CPUs (2-32)"
range 2 32
depends on SMP depends on SMP
default "32" default "32"
help help
......
...@@ -154,6 +154,7 @@ config HPUX ...@@ -154,6 +154,7 @@ config HPUX
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-32)" int "Maximum number of CPUs (2-32)"
range 2 32
depends on SMP depends on SMP
default "32" default "32"
......
...@@ -681,6 +681,7 @@ config IRQ_ALL_CPUS ...@@ -681,6 +681,7 @@ config IRQ_ALL_CPUS
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-32)" int "Maximum number of CPUs (2-32)"
range 2 32
depends on SMP depends on SMP
default "4" default "4"
......
...@@ -112,6 +112,7 @@ config IRQ_ALL_CPUS ...@@ -112,6 +112,7 @@ config IRQ_ALL_CPUS
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-128)" int "Maximum number of CPUs (2-128)"
range 2 128
depends on SMP depends on SMP
default "32" default "32"
......
...@@ -97,6 +97,7 @@ config SMP ...@@ -97,6 +97,7 @@ config SMP
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-32)" int "Maximum number of CPUs (2-32)"
range 2 32
depends on SMP && ARCH_S390X = 'n' depends on SMP && ARCH_S390X = 'n'
default "32" default "32"
help help
...@@ -109,6 +110,7 @@ config NR_CPUS ...@@ -109,6 +110,7 @@ config NR_CPUS
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-64)" int "Maximum number of CPUs (2-64)"
range 2 64
depends on SMP && ARCH_S390X depends on SMP && ARCH_S390X
default "64" default "64"
help help
......
...@@ -492,6 +492,7 @@ config SMP ...@@ -492,6 +492,7 @@ config SMP
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-32)" int "Maximum number of CPUs (2-32)"
range 2 32
depends on SMP depends on SMP
default "2" default "2"
help help
......
...@@ -112,6 +112,7 @@ config SMP ...@@ -112,6 +112,7 @@ config SMP
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-32)" int "Maximum number of CPUs (2-32)"
range 2 32
depends on SMP depends on SMP
default "32" default "32"
......
...@@ -128,6 +128,7 @@ config PREEMPT ...@@ -128,6 +128,7 @@ config PREEMPT
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-64)" int "Maximum number of CPUs (2-64)"
range 2 64
depends on SMP depends on SMP
default "64" default "64"
......
...@@ -128,6 +128,7 @@ config SMP ...@@ -128,6 +128,7 @@ config SMP
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-32)" int "Maximum number of CPUs (2-32)"
range 2 32
depends on SMP depends on SMP
default "32" default "32"
......
...@@ -233,6 +233,7 @@ config HAVE_DEC_LOCK ...@@ -233,6 +233,7 @@ config HAVE_DEC_LOCK
# to use clustered mode or whatever your big iron needs # to use clustered mode or whatever your big iron needs
config NR_CPUS config NR_CPUS
int "Maximum number of CPUs (2-8)" int "Maximum number of CPUs (2-8)"
range 2 8
depends on SMP depends on SMP
default "8" default "8"
help help
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment