From f5ace1666d0e4b2de3635355e84009a9bed23ed5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 19 Jan 2004 05:11:15 -0800 Subject: [PATCH] [PATCH] Kconfig: use range for NR_CPUS From: Adrian Bunk 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)? --- arch/alpha/Kconfig | 1 + arch/i386/Kconfig | 1 + arch/ia64/Kconfig | 3 ++- arch/mips/Kconfig | 1 + arch/parisc/Kconfig | 1 + arch/ppc/Kconfig | 1 + arch/ppc64/Kconfig | 1 + arch/s390/Kconfig | 2 ++ arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/sparc64/Kconfig | 1 + arch/um/Kconfig | 1 + arch/x86_64/Kconfig | 1 + 13 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index e7766d3ec6d8a..72ffe90d913c3 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -509,6 +509,7 @@ config HAVE_DEC_LOCK config NR_CPUS int "Maximum number of CPUs (2-64)" + range 2 64 depends on SMP default "64" diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 3217c7b98a62d..a4f48859f23bb 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -447,6 +447,7 @@ config SMP config NR_CPUS int "Maximum number of CPUs (2-255)" + range 2 255 depends on SMP default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 default "8" diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 4f514bae9d9fa..d6a3503cb7953 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -405,7 +405,8 @@ config EFI_VARS support" (CONFIG_PROC_FS) is enabled, too. config NR_CPUS - int "Maximum number of CPUs" + int "Maximum number of CPUs (2-512)" + range 2 512 depends on SMP default "64" help diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index edb286f9d4837..f7dc991d16317 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -981,6 +981,7 @@ config SMP config NR_CPUS int "Maximum number of CPUs (2-32)" + range 2 32 depends on SMP default "32" help diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index d93e742d128a7..7938686bbb32a 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -154,6 +154,7 @@ config HPUX config NR_CPUS int "Maximum number of CPUs (2-32)" + range 2 32 depends on SMP default "32" diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 16d645ab3cea0..ec25b00bfaaf7 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -681,6 +681,7 @@ config IRQ_ALL_CPUS config NR_CPUS int "Maximum number of CPUs (2-32)" + range 2 32 depends on SMP default "4" diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig index 877e92374e084..da52c803e16f8 100644 --- a/arch/ppc64/Kconfig +++ b/arch/ppc64/Kconfig @@ -112,6 +112,7 @@ config IRQ_ALL_CPUS config NR_CPUS int "Maximum number of CPUs (2-128)" + range 2 128 depends on SMP default "32" diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index f9f86dd0b5fb3..a0f338a91eca1 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -97,6 +97,7 @@ config SMP config NR_CPUS int "Maximum number of CPUs (2-32)" + range 2 32 depends on SMP && ARCH_S390X = 'n' default "32" help @@ -109,6 +110,7 @@ config NR_CPUS config NR_CPUS int "Maximum number of CPUs (2-64)" + range 2 64 depends on SMP && ARCH_S390X default "64" help diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 7d650503e52a3..caf27cd4cce92 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -492,6 +492,7 @@ config SMP config NR_CPUS int "Maximum number of CPUs (2-32)" + range 2 32 depends on SMP default "2" help diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index c9d557f7e660c..f29b3f98c6486 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -112,6 +112,7 @@ config SMP config NR_CPUS int "Maximum number of CPUs (2-32)" + range 2 32 depends on SMP default "32" diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index dfff0d5786527..bc39ada548f31 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -128,6 +128,7 @@ config PREEMPT config NR_CPUS int "Maximum number of CPUs (2-64)" + range 2 64 depends on SMP default "64" diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 3fe5859666869..aeb6e0ebd6199 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -128,6 +128,7 @@ config SMP config NR_CPUS int "Maximum number of CPUs (2-32)" + range 2 32 depends on SMP default "32" diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 3e928aa6c529d..c29b7fe7fb234 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -233,6 +233,7 @@ config HAVE_DEC_LOCK # to use clustered mode or whatever your big iron needs config NR_CPUS int "Maximum number of CPUs (2-8)" + range 2 8 depends on SMP default "8" help -- 2.53.0