From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Fri, 20 Jun 2008 14:33:31 +0000 (-0700)
Subject: x86: simplify x86_mpparse dependency check
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bad48f4b313a756ccde454c25c14c828e2fd5819;p=deliverable%2Flinux.git

x86: simplify x86_mpparse dependency check

"Maciej W. Rozycki" <macro@linux-mips.org> said:

> Given X86_64 selects X86_LOCAL_APIC I am not sure the redundancy seen
>above does not actually obscure the logic behind...  I think:
>
>       depends on X86_LOCAL_APIC && !X86_VISWS
>
>would be clearer and get the same.

Suggested-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.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 25251799337f..23c352e408af 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -239,7 +239,7 @@ if ACPI
 config X86_MPPARSE
 	def_bool y
 	bool "Enable MPS table"
-	depends on ((X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64)
+	depends on X86_LOCAL_APIC && !X86_VISWS
 	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
@@ -248,7 +248,7 @@ endif
 if !ACPI
 config X86_MPPARSE
 	def_bool y
-	depends on ((X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64)
+	depends on X86_LOCAL_APIC && !X86_VISWS
 endif
 
 choice