1 files changed, 3 insertions, 4 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 5f89c74537ef..bfea1bedcbf2 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -80,6 +80,7 @@ config X86_VOYAGER
 
 config X86_NUMAQ
         bool "NUMAQ (IBM/Sequent)"
+        select SMP
         select NUMA
         help
           This option is used for getting Linux to run on a (IBM/Sequent) NUMA
@@ -400,6 +401,7 @@ choice
 
 config NOHIGHMEM
         bool "off"
+        depends on !X86_NUMAQ
         ---help---
           Linux can use up to 64 Gigabytes of physical memory on x86 systems.
           However, the address space of 32-bit x86 processors is only 4
@@ -436,6 +438,7 @@ config NOHIGHMEM
 
 config HIGHMEM4G
         bool "4GB"
+        depends on !X86_NUMAQ
         help
           Select this if you have a 32-bit processor and between 1 and 4
           gigabytes of physical RAM.
@@ -503,10 +506,6 @@ config NUMA
         default n if X86_PC
         default y if (X86_NUMAQ || X86_SUMMIT)
 
-# Need comments to help the hapless user trying to turn on NUMA support
-comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support"
-        depends on X86_NUMAQ && (!HIGHMEM64G || !SMP)
-
 comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
         depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)