Commit 38e716aa authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds

[PATCH] x86: NUMAQ Kconfig fix

When we select NUMA with i386, the system is only X86_NUMAQ or using ACPI.
Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f5ef68da
...@@ -142,6 +142,7 @@ config X86_SUMMIT ...@@ -142,6 +142,7 @@ config X86_SUMMIT
In particular, it is needed for the x440. In particular, it is needed for the x440.
If you don't have one of these computers, you should say N here. If you don't have one of these computers, you should say N here.
If you want to build a NUMA kernel, you must select ACPI.
config X86_BIGSMP config X86_BIGSMP
bool "Support for other sub-arch SMP systems with more than 8 CPUs" bool "Support for other sub-arch SMP systems with more than 8 CPUs"
...@@ -169,6 +170,7 @@ config X86_GENERICARCH ...@@ -169,6 +170,7 @@ config X86_GENERICARCH
help help
This option compiles in the Summit, bigsmp, ES7000, default subarchitectures. This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
It is intended for a generic binary kernel. It is intended for a generic binary kernel.
If you want a NUMA kernel, select ACPI. We need SRAT for NUMA.
config X86_ES7000 config X86_ES7000
bool "Support for Unisys ES7000 IA32 series" bool "Support for Unisys ES7000 IA32 series"
...@@ -542,7 +544,7 @@ config X86_PAE ...@@ -542,7 +544,7 @@ config X86_PAE
# Common NUMA Features # Common NUMA Features
config NUMA config NUMA
bool "Numa Memory Allocation and Scheduler Support" bool "Numa Memory Allocation and Scheduler Support"
depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI)) depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI)
default n if X86_PC default n if X86_PC
default y if (X86_NUMAQ || X86_SUMMIT) default y if (X86_NUMAQ || X86_SUMMIT)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment