Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] x86: NUMAQ Kconfig fix
When we select NUMA with i386, the system is only X86_NUMAQ or using ACPI.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by
KAMEZAWA Hiroyuki
and committed by
Linus Torvalds
38e716aa
f5ef68da
+3
-1
+3
-1
arch/i386/Kconfig
+3
-1
arch/i386/Kconfig
···
142
142
In particular, it is needed for the x440.
143
143
144
144
If you don't have one of these computers, you should say N here.
145
+
If you want to build a NUMA kernel, you must select ACPI.
145
146
146
147
config X86_BIGSMP
147
148
bool "Support for other sub-arch SMP systems with more than 8 CPUs"
···
170
169
help
171
170
This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
172
171
It is intended for a generic binary kernel.
172
+
If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
173
173
174
174
config X86_ES7000
175
175
bool "Support for Unisys ES7000 IA32 series"
···
544
542
# Common NUMA Features
545
543
config NUMA
546
544
bool "Numa Memory Allocation and Scheduler Support"
547
-
depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI))
545
+
depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI)
548
546
default n if X86_PC
549
547
default y if (X86_NUMAQ || X86_SUMMIT)
550
548