From: Dave Hansen <dave.han...@linux.intel.com>
We had a new CPUID "NCAPINT" word added, but the REQUIRED_MASK and
DISABLED_MASK macros did not get updated. Update them.
None of the features was needed in these masks, so there was no
harm, but we should keep them updated anyway.
Signed-off-by: Dave Hansen <dave.han...@linux.intel.com>
---
b/arch/x86/include/asm/cpufeature.h | 6 ++++--
b/arch/x86/include/asm/disabled-features.h | 1 +
b/arch/x86/include/asm/required-features.h | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
diff -puN arch/x86/include/asm/cpufeature.h~update-macros
arch/x86/include/asm/cpufeature.h
--- a/arch/x86/include/asm/cpufeature.h~update-macros 2016-06-29
12:59:57.742501943 -0700
+++ b/arch/x86/include/asm/cpufeature.h 2016-06-29 12:59:57.748502214 -0700
@@ -66,7 +66,8 @@ extern const char * const x86_bug_flags[
(((bit)>>5)==13 && (1UL<<((bit)&31) & REQUIRED_MASK13)) || \
(((bit)>>5)==14 && (1UL<<((bit)&31) & REQUIRED_MASK14)) || \
(((bit)>>5)==15 && (1UL<<((bit)&31) & REQUIRED_MASK15)) || \
- (((bit)>>5)==16 && (1UL<<((bit)&31) & REQUIRED_MASK16)) )
+ (((bit)>>5)==16 && (1UL<<((bit)&31) & REQUIRED_MASK16)) || \
+ (((bit)>>5)==17 && (1UL<<((bit)&31) & REQUIRED_MASK17)))
#define DISABLED_MASK_BIT_SET(bit) \
( (((bit)>>5)==0 && (1UL<<((bit)&31) & DISABLED_MASK0 )) || \
@@ -85,7 +86,8 @@ extern const char * const x86_bug_flags[
(((bit)>>5)==13 && (1UL<<((bit)&31) & DISABLED_MASK13)) || \
(((bit)>>5)==14 && (1UL<<((bit)&31) & DISABLED_MASK14)) || \
(((bit)>>5)==15 && (1UL<<((bit)&31) & DISABLED_MASK15)) || \
- (((bit)>>5)==16 && (1UL<<((bit)&31) & DISABLED_MASK16)) )
+ (((bit)>>5)==16 && (1UL<<((bit)&31) & DISABLED_MASK16)) || \
+ (((bit)>>5)==17 && (1UL<<((bit)&31) & DISABLED_MASK17)))
#define cpu_has(c, bit)
\
(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
diff -puN arch/x86/include/asm/disabled-features.h~update-macros
arch/x86/include/asm/disabled-features.h
--- a/arch/x86/include/asm/disabled-features.h~update-macros 2016-06-29
12:59:57.744502033 -0700
+++ b/arch/x86/include/asm/disabled-features.h 2016-06-29 12:59:57.749502259
-0700
@@ -56,5 +56,6 @@
#define DISABLED_MASK14 0
#define DISABLED_MASK15 0
#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE)
+#define DISABLED_MASK17 0
#endif /* _ASM_X86_DISABLED_FEATURES_H */
diff -puN arch/x86/include/asm/required-features.h~update-macros
arch/x86/include/asm/required-features.h
--- a/arch/x86/include/asm/required-features.h~update-macros 2016-06-29
12:59:57.745502078 -0700
+++ b/arch/x86/include/asm/required-features.h 2016-06-29 12:59:57.749502259
-0700
@@ -99,5 +99,6 @@
#define REQUIRED_MASK14 0
#define REQUIRED_MASK15 0
#define REQUIRED_MASK16 0
+#define REQUIRED_MASK17 0
#endif /* _ASM_X86_REQUIRED_FEATURES_H */
_
