diff options
Diffstat (limited to 'arch/x86/include/asm/disabled-features.h')
| -rw-r--r-- | arch/x86/include/asm/disabled-features.h | 8 | 
1 files changed, 7 insertions, 1 deletions
| diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index 14d6d5007314..b027633e7300 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -50,6 +50,12 @@  # define DISABLE_LA57	(1<<(X86_FEATURE_LA57 & 31))  #endif +#ifdef CONFIG_PAGE_TABLE_ISOLATION +# define DISABLE_PTI		0 +#else +# define DISABLE_PTI		(1 << (X86_FEATURE_PTI & 31)) +#endif +  /*   * Make sure to add features to the correct mask   */ @@ -60,7 +66,7 @@  #define DISABLED_MASK4	(DISABLE_PCID)  #define DISABLED_MASK5	0  #define DISABLED_MASK6	0 -#define DISABLED_MASK7	0 +#define DISABLED_MASK7	(DISABLE_PTI)  #define DISABLED_MASK8	0  #define DISABLED_MASK9	(DISABLE_MPX)  #define DISABLED_MASK10	0 |