summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Travis <travis@sgi.com>2008-12-17 02:34:00 +0100
committerMike Travis <travis@sgi.com>2008-12-17 02:40:58 +0100
commit78637a97b7fe1df51f40a460448df0b93d511176 (patch)
treef2cf1f4afd476ff37a0daf4518685e15d151b6fa
parentx86: cosmetic changes apic-related files. (diff)
downloadlinux-78637a97b7fe1df51f40a460448df0b93d511176.tar.xz
linux-78637a97b7fe1df51f40a460448df0b93d511176.zip
x86: Set CONFIG_NR_CPUS even on UP
Impact: cleanup Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Mike Travis <travis@sgi.com>
-rw-r--r--arch/x86/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1fd44352f27c..4a3f5851ec64 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -599,12 +599,12 @@ config MAXSMP
If unsure, say N.
config NR_CPUS
- depends on SMP
int "Maximum number of CPUs" if SMP && !MAXSMP
range 2 512 if SMP && !MAXSMP
+ default "1" if !SMP
default "4096" if MAXSMP
- default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
- default "8"
+ default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000)
+ default "8" if SMP
help
This allows you to specify the maximum number of CPUs which this
kernel will support. The maximum supported value is 512 and the