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