x86: don't treat bigsmp as non-standard

just like 64 bit switch from flat logical APIC messages to
flat physical mode automatically.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 7 insertions, 8 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index afaf2cb7c1ac..c6e567bb6491 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -262,6 +262,12 @@ config X86_MPPARSE
           For old smp systems that do not have proper acpi support. Newer systems
           (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
 
+config X86_BIGSMP
+        bool "Support for big SMP systems with more than 8 CPUs"
+        depends on X86_32 && SMP
+        help
+          This option is needed for the systems that have more than 8 CPUs
+
 config X86_NON_STANDARD
         bool "Support for non-standard x86 platforms"
         help
@@ -338,13 +344,6 @@ config X86_32_NON_STANDARD
           if you select them all, kernel will probe it one by one. and will
           fallback to default.
 
-config X86_BIGSMP
-        bool "Support for big SMP systems with more than 8 CPUs"
-        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.
-
 config X86_NUMAQ
         bool "NUMAQ (IBM/Sequent)"
         depends on X86_32_NON_STANDARD
@@ -366,7 +365,7 @@ config X86_SUMMIT
 
 config X86_ES7000
         bool "Support for Unisys ES7000 IA32 series"
-        depends on X86_32_NON_STANDARD
+        depends on X86_32_NON_STANDARD && X86_BIGSMP
         help
           Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is
           supposed to run on an IA32-based Unisys ES7000 system.