diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-22 14:33:10 -0800 |
| commit | 9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a (patch) | |
| tree | e9c1e5d2400ad20c5a9cd633b52a42a00d1d98cb /tools/arch/x86/include/asm/disabled-features.h | |
| parent | 3e8c73671244af16f1a6042f1c10d13b75cd1156 (diff) | |
| parent | 49a57857aeea06ca831043acbb0fa5e0f50602fd (diff) | |
| download | lwn-9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a.tar.gz lwn-9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a.zip | |
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.
Diffstat (limited to 'tools/arch/x86/include/asm/disabled-features.h')
| -rw-r--r-- | tools/arch/x86/include/asm/disabled-features.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index 33833d1909af..a5ea841cc6d2 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -16,6 +16,12 @@ # define DISABLE_MPX (1<<(X86_FEATURE_MPX & 31)) #endif +#ifdef CONFIG_X86_SMAP +# define DISABLE_SMAP 0 +#else +# define DISABLE_SMAP (1<<(X86_FEATURE_SMAP & 31)) +#endif + #ifdef CONFIG_X86_INTEL_UMIP # define DISABLE_UMIP 0 #else @@ -68,7 +74,7 @@ #define DISABLED_MASK6 0 #define DISABLED_MASK7 (DISABLE_PTI) #define DISABLED_MASK8 0 -#define DISABLED_MASK9 (DISABLE_MPX) +#define DISABLED_MASK9 (DISABLE_MPX|DISABLE_SMAP) #define DISABLED_MASK10 0 #define DISABLED_MASK11 0 #define DISABLED_MASK12 0 |