X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Fasm-x86%2Frequired-features.h;h=5c2ff4bc2980b0c21d4973f52c123ab1cca45e7f;hb=efba91bd9066890ae93270eb3d0e55de43368f0b;hp=adec887dd7cd5f07c1148f8c233e033e05160e40;hpb=4f30cb0262847392d8d006042f24bd90abd24f9d;p=linux-2.6-omap-h63xx.git

diff --git a/include/asm-x86/required-features.h b/include/asm-x86/required-features.h
index adec887dd7c..5c2ff4bc298 100644
--- a/include/asm-x86/required-features.h
+++ b/include/asm-x86/required-features.h
@@ -41,6 +41,12 @@
 # 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	0
 #define NEED_MSR	(1<<(X86_FEATURE_MSR & 31))
@@ -67,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