| Message ID | 20180510135422.6585-1-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Agree. Was going to send that the moment the other patches landed upstream. Glad I dont have to do it :-) Reviewed-by: Ram Pai <linuxram@us.ibm.com> On Thu, May 10, 2018 at 11:54:22PM +1000, Michael Ellerman wrote: > Now that we've updated the generic headers to support 5 PKEY bits for > powerpc we don't need our own #defines in arch code. > > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> > --- > arch/powerpc/include/asm/pkeys.h | 15 --------------- > 1 file changed, 15 deletions(-) > > One additional patch to finish cleaning things up. > > I've added this to my branch. > > cheers > > diff --git a/arch/powerpc/include/asm/pkeys.h b/arch/powerpc/include/asm/pkeys.h > index 18ef59a9886d..5ba80cffb505 100644 > --- a/arch/powerpc/include/asm/pkeys.h > +++ b/arch/powerpc/include/asm/pkeys.h > @@ -15,21 +15,6 @@ DECLARE_STATIC_KEY_TRUE(pkey_disabled); > extern int pkeys_total; /* total pkeys as per device tree */ > extern u32 initial_allocation_mask; /* bits set for reserved keys */ > > -/* > - * Define these here temporarily so we're not dependent on patching linux/mm.h. > - * Once it's updated we can drop these. > - */ > -#ifndef VM_PKEY_BIT0 > -# 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 > -# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 > -# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 > -# define VM_PKEY_BIT4 VM_HIGH_ARCH_4 > -#elif !defined(VM_PKEY_BIT4) > -# define VM_PKEY_BIT4 VM_HIGH_ARCH_4 > -#endif > - > #define ARCH_VM_PKEY_FLAGS (VM_PKEY_BIT0 | VM_PKEY_BIT1 | VM_PKEY_BIT2 | \ > VM_PKEY_BIT3 | VM_PKEY_BIT4) > > -- > 2.14.1
diff --git a/arch/powerpc/include/asm/pkeys.h b/arch/powerpc/include/asm/pkeys.h index 18ef59a9886d..5ba80cffb505 100644 --- a/arch/powerpc/include/asm/pkeys.h +++ b/arch/powerpc/include/asm/pkeys.h @@ -15,21 +15,6 @@ DECLARE_STATIC_KEY_TRUE(pkey_disabled); extern int pkeys_total; /* total pkeys as per device tree */ extern u32 initial_allocation_mask; /* bits set for reserved keys */ -/* - * Define these here temporarily so we're not dependent on patching linux/mm.h. - * Once it's updated we can drop these. - */ -#ifndef VM_PKEY_BIT0 -# 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 -# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 -# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 -# define VM_PKEY_BIT4 VM_HIGH_ARCH_4 -#elif !defined(VM_PKEY_BIT4) -# define VM_PKEY_BIT4 VM_HIGH_ARCH_4 -#endif - #define ARCH_VM_PKEY_FLAGS (VM_PKEY_BIT0 | VM_PKEY_BIT1 | VM_PKEY_BIT2 | \ VM_PKEY_BIT3 | VM_PKEY_BIT4)
Now that we've updated the generic headers to support 5 PKEY bits for powerpc we don't need our own #defines in arch code. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/include/asm/pkeys.h | 15 --------------- 1 file changed, 15 deletions(-) One additional patch to finish cleaning things up. I've added this to my branch. cheers