[PATCH] conditionalize some x86-64 options

[Ulrich Drepper]

Shouldn't the X86_MCE{INTEL,AMD} option depend on the other
manufacturer's CPU not being explicitly selected?

Signed-off-by: Ulrich Drepper <drepper@xxxxxxxxxx>


diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 010d226..f414fe2 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -470,7 +470,7 @@ config X86_MCE

config X86_MCE_INTEL
       bool "Intel MCE features"
-       depends on X86_MCE && X86_LOCAL_APIC
+       depends on X86_MCE && X86_LOCAL_APIC && !MK8
       default y
       help
          Additional support for intel specific MCE features such as
@@ -478,7 +478,7 @@ config X86_MCE_INTEL

config X86_MCE_AMD
       bool "AMD MCE features"
-       depends on X86_MCE && X86_LOCAL_APIC
+       depends on X86_MCE && X86_LOCAL_APIC && !MPSC
       default y
       help
          Additional support for AMD specific MCE features such as
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/