From: Mike Travis <travis@sgi.com>
Date: Wed, 17 Dec 2008 01:34:00 +0000 (-0800)
Subject: x86: Set CONFIG_NR_CPUS even on UP
X-Git-Tag: v2.6.29-rc1~538^2~21^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=78637a97b7fe1df51f40a460448df0b93d511176;p=linux-2.6-omap-h63xx.git

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

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1fd44352f27..4a3f5851ec6 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