git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
Kconfig
diff --git
a/arch/x86/Kconfig
b/arch/x86/Kconfig
index 4627df19a941760b61150cf5ffcf75ad1c9ea0d9..df9e885eee143ba5434a39461821a14e3fc102df 100644
(file)
--- a/
arch/x86/Kconfig
+++ b/
arch/x86/Kconfig
@@
-665,6
+665,7
@@
config MAXSMP
config NR_CPUS
int "Maximum number of CPUs" if SMP && !MAXSMP
+ range 2 8 if SMP && X86_32 && !X86_BIGSMP
range 2 512 if SMP && !MAXSMP
default "1" if !SMP
default "4096" if MAXSMP