Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=78637a...
Commit: 78637a97b7fe1df51f40a460448df0b93d511176
Parent: bcda016eddd7a8b374bb371473c821a91ff1d8cc
Author: Mike Travis <travis@sgi.com>
AuthorDate: Tue Dec 16 17:34:00 2008 -0800
Committer: Mike Travis <travis@sgi.com>
CommitDate: Tue Dec 16 17:40:58 2008 -0800
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>
---
arch/x86/Kconfig | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1fd4435..4a3f585 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
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
