Skip to content

Commit 7bbcbd3

Browse files
KAGA-KOKOIngo Molnar
authored andcommitted
x86/Kconfig: Limit NR_CPUS on 32-bit to a sane amount
The recent cpu_entry_area changes fail to compile on 32-bit when BIGSMP=y and NR_CPUS=512, because the fixmap area becomes too big. Limit the number of CPUs with BIGSMP to 64, which is already way to big for 32-bit, but it's at least a working limitation. We performed a quick survey of 32-bit-only machines that might be affected by this change negatively, but found none. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Dave Hansen <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Juergen Gross <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 6cbd217 commit 7bbcbd3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,8 @@ config MAXSMP
925925
config NR_CPUS
926926
int "Maximum number of CPUs" if SMP && !MAXSMP
927927
range 2 8 if SMP && X86_32 && !X86_BIGSMP
928-
range 2 512 if SMP && !MAXSMP && !CPUMASK_OFFSTACK
928+
range 2 64 if SMP && X86_32 && X86_BIGSMP
929+
range 2 512 if SMP && !MAXSMP && !CPUMASK_OFFSTACK && X86_64
929930
range 2 8192 if SMP && !MAXSMP && CPUMASK_OFFSTACK && X86_64
930931
default "1" if !SMP
931932
default "8192" if MAXSMP

0 commit comments

Comments
 (0)