diff options
| author | Michael K. Johnson <johnsonm@rpath.com> | 2009-04-21 21:44:48 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-04-21 22:34:54 -0400 |
| commit | 2a3313f494c2f3f74a27d66f0f14b38558b7dba2 (patch) | |
| tree | 3f5799fd8efb0c8cf7fd6f8ce5c768ef59279b6b | |
| parent | fcc5c4a2feea3886dc058498b28508b2731720d5 (diff) | |
x86: more than 8 32-bit CPUs requires X86_BIGSMP
$ cat x86-more-than-8-cpus-requires-bigsmp.patch
Enforce NR_CPUS <= 8 limitation if X86_BIGSMP not set
Configuring more than 8 logical CPUs on 32-bit x86 requires
X86_BIGSMP to be set in order to boot successfully, if more than 8
logical CPUs are actually found at boot time. The X86_BIGSMP help
text describes that it is required to be set if more than 8 CPUs
are configured, but this was previously not enforced.
This configuration error has affected multiple distributions:
https://bugzilla.redhat.com/show_bug.cgi?id=480844
https://issues.rpath.com/browse/RPL-3022
Signed-off-by: Michael K Johnson <johnsonm@rpath.com>
LKML-Reference: <20090422014448.GB32541@logo.rdu.rpath.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c9086e6307a5..b5cda6c03d1d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -664,6 +664,7 @@ config MAXSMP | |||
| 664 | 664 | ||
| 665 | config NR_CPUS | 665 | config NR_CPUS |
| 666 | int "Maximum number of CPUs" if SMP && !MAXSMP | 666 | int "Maximum number of CPUs" if SMP && !MAXSMP |
| 667 | range 2 8 if SMP && X86_32 && !X86_BIGSMP | ||
| 667 | range 2 512 if SMP && !MAXSMP | 668 | range 2 512 if SMP && !MAXSMP |
| 668 | default "1" if !SMP | 669 | default "1" if !SMP |
| 669 | default "4096" if MAXSMP | 670 | default "4096" if MAXSMP |