diff options
-rw-r--r-- | arch/i386/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index f71fb4a029cb..b2751eadbc56 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -142,6 +142,7 @@ config X86_SUMMIT | |||
142 | In particular, it is needed for the x440. | 142 | In particular, it is needed for the x440. |
143 | 143 | ||
144 | If you don't have one of these computers, you should say N here. | 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 | config X86_BIGSMP | 147 | config X86_BIGSMP |
147 | bool "Support for other sub-arch SMP systems with more than 8 CPUs" | 148 | bool "Support for other sub-arch SMP systems with more than 8 CPUs" |
@@ -169,6 +170,7 @@ config X86_GENERICARCH | |||
169 | help | 170 | help |
170 | This option compiles in the Summit, bigsmp, ES7000, default subarchitectures. | 171 | This option compiles in the Summit, bigsmp, ES7000, default subarchitectures. |
171 | It is intended for a generic binary kernel. | 172 | It is intended for a generic binary kernel. |
173 | If you want a NUMA kernel, select ACPI. We need SRAT for NUMA. | ||
172 | 174 | ||
173 | config X86_ES7000 | 175 | config X86_ES7000 |
174 | bool "Support for Unisys ES7000 IA32 series" | 176 | bool "Support for Unisys ES7000 IA32 series" |
@@ -542,7 +544,7 @@ config X86_PAE | |||
542 | # Common NUMA Features | 544 | # Common NUMA Features |
543 | config NUMA | 545 | config NUMA |
544 | bool "Numa Memory Allocation and Scheduler Support" | 546 | bool "Numa Memory Allocation and Scheduler Support" |
545 | depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI)) | 547 | depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) |
546 | default n if X86_PC | 548 | default n if X86_PC |
547 | default y if (X86_NUMAQ || X86_SUMMIT) | 549 | default y if (X86_NUMAQ || X86_SUMMIT) |
548 | 550 | ||