"commit df3735c5 -- x86,mpx: make mpx depend on x86-64 to free up VMA flag" added the same vm highmem flag we had introduced for PKEY4. That broke some of the definitions in pkeys.h
This patch fixes the issue. Signed-off-by: Ram Pai <linux...@us.ibm.com> --- arch/powerpc/include/asm/pkeys.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/pkeys.h b/arch/powerpc/include/asm/pkeys.h index baac435..da0d5e6 100644 --- a/arch/powerpc/include/asm/pkeys.h +++ b/arch/powerpc/include/asm/pkeys.h @@ -15,9 +15,7 @@ * we have to carry the hunk below. This is needed to get * pkeys working on power. -- Ram */ -#ifndef VM_HIGH_ARCH_BIT_4 -#define VM_HIGH_ARCH_BIT_4 36 -#define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4) +#ifndef VM_PKEY_BIT4 #define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_0 #define VM_PKEY_BIT0 VM_HIGH_ARCH_0 #define VM_PKEY_BIT1 VM_HIGH_ARCH_1 -- 1.7.1
