2004-01-09 01:42:10

by Adrian Bunk

Subject: [2.6 patch] use range for NR_CPUS

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)?


diffstat output:

arch/alpha/Kconfig | 1 +
arch/i386/Kconfig | 1 +
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 +
12 files changed, 13 insertions(+)


cu
Adrian

--- linux-2.6.1-rc2-mm1/arch/sparc64/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/sparc64/Kconfig 2004-01-09 02:18:54.000000000 +0100
@@ -128,6 +128,7 @@

config NR_CPUS
int "Maximum number of CPUs (2-64)"
+ range 2 64
depends on SMP
default "64"

--- linux-2.6.1-rc2-mm1/arch/i386/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/i386/Kconfig 2004-01-09 02:19:09.000000000 +0100
@@ -495,6 +495,7 @@

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"
--- linux-2.6.1-rc2-mm1/arch/sparc/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/sparc/Kconfig 2004-01-09 02:19:28.000000000 +0100
@@ -112,6 +112,7 @@

config NR_CPUS
int "Maximum number of CPUs (2-32)"
+ range 2 32
depends on SMP
default "32"

--- linux-2.6.1-rc2-mm1/arch/ppc/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/ppc/Kconfig 2004-01-09 02:19:40.000000000 +0100
@@ -681,6 +681,7 @@

config NR_CPUS
int "Maximum number of CPUs (2-32)"
+ range 2 32
depends on SMP
default "4"

--- linux-2.6.1-rc2-mm1/arch/um/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/um/Kconfig 2004-01-09 02:21:25.000000000 +0100
@@ -128,6 +128,7 @@

config NR_CPUS
int "Maximum number of CPUs (2-32)"
+ range 2 32
depends on SMP
default "32"

--- linux-2.6.1-rc2-mm1/arch/mips/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/mips/Kconfig 2004-01-09 02:21:36.000000000 +0100
@@ -981,6 +981,7 @@

config NR_CPUS
int "Maximum number of CPUs (2-32)"
+ range 2 32
depends on SMP
default "32"
help
--- linux-2.6.1-rc2-mm1/arch/sh/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/sh/Kconfig 2004-01-09 02:21:47.000000000 +0100
@@ -467,6 +467,7 @@

config NR_CPUS
int "Maximum number of CPUs (2-32)"
+ range 2 32
depends on SMP
default "2"
help
--- linux-2.6.1-rc2-mm1/arch/alpha/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/alpha/Kconfig 2004-01-09 02:22:44.000000000 +0100
@@ -509,6 +509,7 @@

config NR_CPUS
int "Maximum number of CPUs (2-64)"
+ range 2 64
depends on SMP
default "64"

--- linux-2.6.1-rc2-mm1/arch/ppc64/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/ppc64/Kconfig 2004-01-09 02:22:58.000000000 +0100
@@ -97,6 +97,7 @@

config NR_CPUS
int "Maximum number of CPUs (2-128)"
+ range 2 128
depends on SMP
default "32"

--- linux-2.6.1-rc2-mm1/arch/parisc/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/parisc/Kconfig 2004-01-09 02:23:10.000000000 +0100
@@ -154,6 +154,7 @@

config NR_CPUS
int "Maximum number of CPUs (2-32)"
+ range 2 32
depends on SMP
default "32"

--- linux-2.6.1-rc2-mm1/arch/x86_64/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/x86_64/Kconfig 2004-01-09 02:23:30.000000000 +0100
@@ -233,6 +233,7 @@
# 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
--- linux-2.6.1-rc2-mm1/arch/s390/Kconfig.old 2004-01-09 02:17:58.000000000 +0100
+++ linux-2.6.1-rc2-mm1/arch/s390/Kconfig 2004-01-09 02:24:19.000000000 +0100
@@ -97,6 +97,7 @@

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
int "Maximum number of CPUs (2-64)"
+ range 2 64
depends on SMP && ARCH_S390X
default "64"
help

2004-01-09 05:17:12

by Paul Jackson

Subject: Re: [2.6 patch] use range for NR_CPUS

> 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)?

It keeps moving. We've announced experimental versions up to 512 CPUs,
I believe. We being SGI, and our SN product, which uses ia64 arch. So
I guess you can put that in.

--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <[email protected]> 1.650.933.1373

2004-01-09 23:47:16

by Adrian Bunk

Subject: [2.6 patch] ia64: use range for NR_CPUS

On Thu, Jan 08, 2004 at 09:17:06PM -0800, Paul Jackson wrote:
> > 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)?
>
> It keeps moving. We've announced experimental versions up to 512 CPUs,
> I believe. We being SGI, and our SN product, which uses ia64 arch. So
> I guess you can put that in.

Thanks for this information.

The patch to use "range" for NR_CPUS on ia64 is below.

cu
Adrian

--- linux-2.6.1-mm1/arch/ia64/Kconfig.old 2004-01-10 00:44:19.000000000 +0100
+++ linux-2.6.1-mm1/arch/ia64/Kconfig 2004-01-10 00:45:17.000000000 +0100
@@ -411,7 +411,8 @@
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