[PATCH] ix86: improve determination of X86_MINIMUM_CPU_FAMILY

[Jan Beulich]

This was quite a bit off: While I never build for anything older than
i686 (other than for specifically trying certain things out), one of my
32-bit configs (tailor made for a VIA system) ended up having this set
to 4. Others, customized for more mainstream systems, had this set to 5.

Once at it, also drop the unnecessary dependencies on X86_32 - that
symbol being the inverse of X86_64, and Kconfig default determination
working by a first match algorithm, X86_64 being dealt with in the very
first selection makes it unnecessary to have that dependency in all
subsequent default selections.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>

---
 arch/x86/Kconfig.cpu |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- 3.6-rc4/arch/x86/Kconfig.cpu
+++ 3.6-rc4-x86-minimum-cpu-family/arch/x86/Kconfig.cpu
@@ -409,9 +409,9 @@ config X86_CMOV
 config X86_MINIMUM_CPU_FAMILY
 	int
 	default "64" if X86_64
-	default "6" if X86_32 && X86_P6_NOP
-	default "5" if X86_32 && X86_CMPXCHG64
-	default "4" if X86_32 && (X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK)
+	default "6" if X86_P6_NOP || X86_CMOV
+	default "5" if X86_CMPXCHG64 || X86_TSC
+	default "4" if X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK
 	default "3"
 
 config X86_DEBUGCTLMSR



--
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/