diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-11 15:39:38 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-11 15:39:38 +0200 |
commit | 8af4b3d7044d83c5426da6e45a9c7948bc7fa231 (patch) | |
tree | 76e15a6cea6b526fe30c679f6e9bf60b08acf983 /include/linux/mm.h | |
parent | a5950f2617f71a3dce16520c4907bcdb31e654ba (diff) | |
parent | c2ebf788f927dcca72beead19fab5f5aba79a098 (diff) |
Merge branch 'acpi-pm' into pm-sleep
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r-- | include/linux/mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index f8c10d336e42..065d99deb847 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -240,7 +240,7 @@ extern unsigned int kobjsize(const void *objp); #if defined(CONFIG_X86_INTEL_MPX) /* MPX specific bounds table or bounds directory */ -# define VM_MPX VM_HIGH_ARCH_BIT_4 +# define VM_MPX VM_HIGH_ARCH_4 #else # define VM_MPX VM_NONE #endif |