x86: let MPS support be selectable, v2

v2: seperate "fix for compiling when MPPARSE is not set" to another patch
    make X86_MPPARSE to be selectable only when acpi is set and
    X86_MPPARSE will be set if acpi is not set.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 7ebd986050a87245f3055286fe10a0342471e0c1..0804a889c27b883c3cf05c60094a8ee6b052fc90 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -230,6 +230,27 @@ config SMP
 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 

+config X86_FIND_SMP_CONFIG
+       def_bool y
+       depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
+       depends on X86_32
+
+if ACPI
+config X86_MPPARSE
+       def_bool y
+       bool "Enable MPS table"
+       depends on ((X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64)
+       help
+         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
+endif
+
+if !ACPI
+config X86_MPPARSE
+       def_bool y
+       depends on ((X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64)
+endif
+

 choice
        prompt "Subarchitecture Type"
        default X86_PC
 choice
        prompt "Subarchitecture Type"
        default X86_PC

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 253e7a5706d36391fc9ac2b3a52f7be4dced66c0..f7d413d6101a25f516c1109816ae77108f97905c 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -129,15 +129,6 @@ config 4KSTACKS
          on the VM subsystem for higher order allocations. This option
          will also use IRQ stacks to compensate for the reduced stackspace.
 
          on the VM subsystem for higher order allocations. This option
          will also use IRQ stacks to compensate for the reduced stackspace.
 

-config X86_FIND_SMP_CONFIG
-       def_bool y
-       depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
-       depends on X86_32
-
-config X86_MPPARSE
-       def_bool y
-       depends on (X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64
-

 config DOUBLEFAULT
        default y
        bool "Enable doublefault exception handler" if EMBEDDED
 config DOUBLEFAULT
        default y
        bool "Enable doublefault exception handler" if EMBEDDED