diff options
author | Julia Cartwright <julia@ni.com> | 2018-08-03 19:54:03 -0500 |
---|---|---|
committer | Julia Cartwright <julia@ni.com> | 2018-08-03 19:54:03 -0500 |
commit | 5c80f8fdaa49b32369591807b3ce244a727d443f (patch) | |
tree | e1a927785cce950208f0d90533f251079ab15f7c /tools/arch/x86/include/asm/disabled-features.h | |
parent | 5da4f30e0c1e40f7400a170d9d918e56a1ccfc60 (diff) | |
parent | 2460c23c35e9a612395b4108dbc19f3c1f016d43 (diff) |
Merge tag 'v4.9.106' into v4.9-rt
This is the 4.9.106 stable release
Diffstat (limited to 'tools/arch/x86/include/asm/disabled-features.h')
-rw-r--r-- | tools/arch/x86/include/asm/disabled-features.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index 85599ad4d024..1f8cca459c6c 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -21,11 +21,13 @@ # define DISABLE_K6_MTRR (1<<(X86_FEATURE_K6_MTRR & 31)) # define DISABLE_CYRIX_ARR (1<<(X86_FEATURE_CYRIX_ARR & 31)) # define DISABLE_CENTAUR_MCR (1<<(X86_FEATURE_CENTAUR_MCR & 31)) +# define DISABLE_PCID 0 #else # define DISABLE_VME 0 # define DISABLE_K6_MTRR 0 # define DISABLE_CYRIX_ARR 0 # define DISABLE_CENTAUR_MCR 0 +# define DISABLE_PCID (1<<(X86_FEATURE_PCID & 31)) #endif /* CONFIG_X86_64 */ #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS @@ -43,7 +45,7 @@ #define DISABLED_MASK1 0 #define DISABLED_MASK2 0 #define DISABLED_MASK3 (DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR) -#define DISABLED_MASK4 0 +#define DISABLED_MASK4 (DISABLE_PCID) #define DISABLED_MASK5 0 #define DISABLED_MASK6 0 #define DISABLED_MASK7 0 @@ -57,6 +59,7 @@ #define DISABLED_MASK15 0 #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE) #define DISABLED_MASK17 0 -#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18) +#define DISABLED_MASK18 0 +#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19) #endif /* _ASM_X86_DISABLED_FEATURES_H */ |