|
@@ -208,10 +208,12 @@ extern unsigned int kobjsize(const void *objp);
|
|
#define VM_HIGH_ARCH_BIT_1 33 /* bit only usable on 64-bit architectures */
|
|
#define VM_HIGH_ARCH_BIT_1 33 /* bit only usable on 64-bit architectures */
|
|
#define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */
|
|
#define VM_HIGH_ARCH_BIT_2 34 /* bit only usable on 64-bit architectures */
|
|
#define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */
|
|
#define VM_HIGH_ARCH_BIT_3 35 /* bit only usable on 64-bit architectures */
|
|
|
|
+#define VM_HIGH_ARCH_BIT_4 36 /* bit only usable on 64-bit architectures */
|
|
#define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0)
|
|
#define VM_HIGH_ARCH_0 BIT(VM_HIGH_ARCH_BIT_0)
|
|
#define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1)
|
|
#define VM_HIGH_ARCH_1 BIT(VM_HIGH_ARCH_BIT_1)
|
|
#define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2)
|
|
#define VM_HIGH_ARCH_2 BIT(VM_HIGH_ARCH_BIT_2)
|
|
#define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3)
|
|
#define VM_HIGH_ARCH_3 BIT(VM_HIGH_ARCH_BIT_3)
|
|
|
|
+#define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4)
|
|
#endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */
|
|
#endif /* CONFIG_ARCH_USES_HIGH_VMA_FLAGS */
|
|
|
|
|
|
#if defined(CONFIG_X86)
|
|
#if defined(CONFIG_X86)
|
|
@@ -235,9 +237,11 @@ extern unsigned int kobjsize(const void *objp);
|
|
# define VM_MAPPED_COPY VM_ARCH_1 /* T if mapped copy of data (nommu mmap) */
|
|
# define VM_MAPPED_COPY VM_ARCH_1 /* T if mapped copy of data (nommu mmap) */
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_X86)
|
|
|
|
|
|
+#if defined(CONFIG_X86_INTEL_MPX)
|
|
/* MPX specific bounds table or bounds directory */
|
|
/* MPX specific bounds table or bounds directory */
|
|
-# define VM_MPX VM_ARCH_2
|
|
|
|
|
|
+# define VM_MPX VM_HIGH_ARCH_BIT_4
|
|
|
|
+#else
|
|
|
|
+# define VM_MPX VM_NONE
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#ifndef VM_GROWSUP
|
|
#ifndef VM_GROWSUP
|