projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86/cpu' into x86/core
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-x86
/
required-features.h
diff --git
a/include/asm-x86/required-features.h
b/include/asm-x86/required-features.h
index d6822e099c57a1b519df6dfd239c6465f200a585..a01c4e376331ab48f65df1cd979439022fbd7cde 100644
(file)
--- a/
include/asm-x86/required-features.h
+++ b/
include/asm-x86/required-features.h
@@
-41,6
+41,12
@@
# define NEED_3DNOW 0
#endif
# 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))
#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_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
#define REQUIRED_MASK4 0
#define REQUIRED_MASK5 0
#define REQUIRED_MASK6 0