[PATCH 3/3] x86: restore 4096 limit for NR_CPUS

Mike Travis
2008-09-05T21:40:46Z

[-- Attachment #1: Kconfig --]
[-- Type: text/plain, Size: 975 bytes --]

* With the previous cleanups, NR_CPUS=4096 can now be enabled again.

Based on 2.6.27-rc5-git6.

Applies to linux-2.6.tip/master (with FUZZ).

Signed-off-by: Mike Travis <travis@sgi.com>
---
arch/x86/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

--- linux-2.6.orig/arch/x86/Kconfig
+++ linux-2.6/arch/x86/Kconfig
@@ -587,8 +587,8 @@ config MAXSMP
If unsure, say N.

config NR_CPUS
- int "Maximum number of CPUs (2-512)" if !MAXSMP
- range 2 512
+ int "Maximum number of CPUs (2-4096)" if !MAXSMP
+ range 2 4096
depends on SMP
default "4096" if MAXSMP
default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
@@ -599,7 +599,7 @@ config NR_CPUS
minimum value which makes sense is 2.

This is purely to save memory - each supported CPU adds
- approximately eight kilobytes to the kernel image.
+ approximately one kilobyte to the kernel image.

config SCHED_SMT
bool "SMT (Hyperthreading) scheduler support"