x86: add NOPL as a synthetic CPU feature bit

[linux-2.6-omap-h63xx.git] / include / asm-x86 / required-features.h

diff --git a/include/asm-x86/required-features.h b/include/asm-x86/required-features.h
index 7400d3ad75c6835233c01d51e4351ecf0a3e8636..5c2ff4bc2980b0c21d4973f52c123ab1cca45e7f 100644 (file)
--- a/include/asm-x86/required-features.h
+++ b/include/asm-x86/required-features.h
@@ -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
 
@@ -37,8 +41,14 @@
 # define NEED_3DNOW    0
 #endif
 
+#if defined(CONFIG_X86_P6_NOP) || defined(CONFIG_X86_64)
+# define NEED_NOPL     (1<<(X86_FEATURE_NOPL & 31))
+#else
+# define NEED_NOPL     0
+#endif
+
 #ifdef CONFIG_X86_64
-#define NEED_PSE       (1<<(X86_FEATURE_PSE & 31))
+#define NEED_PSE       0
 #define NEED_MSR       (1<<(X86_FEATURE_MSR & 31))
 #define NEED_PGE       (1<<(X86_FEATURE_PGE & 31))
 #define NEED_FXSR      (1<<(X86_FEATURE_FXSR & 31))
@@ -63,7 +73,7 @@
 #define REQUIRED_MASK1 (NEED_LM|NEED_3DNOW)
 
 #define REQUIRED_MASK2 0
-#define REQUIRED_MASK3 0
+#define REQUIRED_MASK3 (NEED_NOPL)
 #define REQUIRED_MASK4 0
 #define REQUIRED_MASK5 0
 #define REQUIRED_MASK6 0