1 files changed, 11 insertions, 11 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4773f1c54fb2..1427cb1ccd97 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -344,7 +344,7 @@ config X86_VOYAGER
           If you do not specifically know you have a Voyager based machine,
           say N here, otherwise the kernel you build will not be bootable.
 
-config X86_GENERICARCH
+config X86_32_NON_STANDARD
         bool "Support non-standard 32-bit SMP architectures"
         depends on X86_32 && SMP
         depends on X86_NON_STANDARD
@@ -356,7 +356,7 @@ config X86_GENERICARCH
 
 config X86_NUMAQ
         bool "NUMAQ (IBM/Sequent)"
-        depends on X86_GENERICARCH
+        depends on X86_32_NON_STANDARD
         select NUMA
         select X86_MPPARSE
         help
@@ -368,21 +368,21 @@ config X86_NUMAQ
 
 config X86_SUMMIT
         bool "Summit/EXA (IBM x440)"
-        depends on X86_GENERICARCH
+        depends on X86_32_NON_STANDARD
         help
           This option is needed for IBM systems that use the Summit/EXA chipset.
           In particular, it is needed for the x440.
 
 config X86_ES7000
         bool "Support for Unisys ES7000 IA32 series"
-        depends on X86_GENERICARCH
+        depends on X86_32_NON_STANDARD
         help
           Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is
           supposed to run on an IA32-based Unisys ES7000 system.
 
 config X86_BIGSMP
         bool "Support for big SMP systems with more than 8 CPUs"
-        depends on X86_GENERICARCH
+        depends on X86_32_NON_STANDARD
         help
           This option is needed for the systems that have more than 8 CPUs
           and if the system is not of any sub-arch type above.
@@ -475,11 +475,11 @@ config MEMTEST
 
 config X86_SUMMIT_NUMA
         def_bool y
-        depends on X86_32 && NUMA && X86_GENERICARCH
+        depends on X86_32 && NUMA && X86_32_NON_STANDARD
 
 config X86_CYCLONE_TIMER
         def_bool y
-        depends on X86_GENERICARCH
+        depends on X86_32_NON_STANDARD
 
 source "arch/x86/Kconfig.cpu"
 
@@ -651,7 +651,7 @@ source "kernel/Kconfig.preempt"
 
 config X86_UP_APIC
         bool "Local APIC support on uniprocessors"
-        depends on X86_32 && !SMP && !X86_GENERICARCH
+        depends on X86_32 && !SMP && !X86_32_NON_STANDARD
         help
           A local APIC (Advanced Programmable Interrupt Controller) is an
           integrated interrupt controller in the CPU. If you have a single-CPU
@@ -676,11 +676,11 @@ config X86_UP_IOAPIC
 
 config X86_LOCAL_APIC
         def_bool y
-        depends on X86_64 || SMP || X86_GENERICARCH || X86_UP_APIC
+        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC
 
 config X86_IO_APIC
         def_bool y
-        depends on X86_64 || SMP || X86_GENERICARCH || X86_UP_APIC
+        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC
 
 config X86_VISWS_APIC
         def_bool y
@@ -1122,7 +1122,7 @@ config ARCH_SPARSEMEM_DEFAULT
 
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
-        depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) || X86_GENERICARCH
+        depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) || X86_32_NON_STANDARD
         select SPARSEMEM_STATIC if X86_32
         select SPARSEMEM_VMEMMAP_ENABLE if X86_64