[PATCH] x86: separate cmpxchg8b checking from PAE checking

[PATCH] x86: separate cmpxchg8b checking from PAE checking

[Jan Beulich]

.. allowing the former to be use in non-PAE kernels, too.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

---
 arch/x86/Kconfig.cpu                |    4 ++++
 include/asm-x86/required-features.h |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

--- linux-2.6.25/arch/x86/Kconfig.cpu	2008-04-17 04:49:44.000000000 +0200
+++ 2.6.25-x86-cmpxchg64/arch/x86/Kconfig.cpu	2008-04-15 10:49:20.000000000 +0200
@@ -394,6 +394,10 @@ config X86_TSC
 	def_bool y
 	depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64
 
+config X86_CMPXCHG64
+	def_bool y
+	depends on X86_PAE || X86_64
+
 # this should be set for all -march=.. options where the compiler
 # generates cmov.
 config X86_CMOV
--- linux-2.6.25/include/asm-x86/required-features.h	2008-01-24 23:58:37.000000000 +0100
+++ 2.6.25-x86-cmpxchg64/include/asm-x86/required-features.h	2008-04-15 10:49:20.000000000 +0200
@@ -19,9 +19,13 @@
 
 #if defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
 # define NEED_PAE	(1<<(X86_FEATURE_PAE & 31))
-# define NEED_CX8	(1<<(X86_FEATURE_CX8 & 31))
 #else
 # define NEED_PAE	0
+#endif
+
+#ifdef CONFIG_X86_CMPXCHG64
+# define NEED_CX8	(1<<(X86_FEATURE_CX8 & 31))
+#else
 # define NEED_CX8	0
 #endif