[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20180510202435.GB6257@ram.oc3035372033.ibm.com>
Date: Thu, 10 May 2018 13:24:36 -0700
From: Ram Pai <linuxram@...ibm.com>
To: Michael Ellerman <mpe@...erman.id.au>
Cc: mingo@...hat.com, linuxppc-dev@...abs.org, linux-mm@...ck.org,
x86@...nel.org, linux-kernel@...r.kernel.org, dave.hansen@...el.com
Subject: Re: [PATCH 9/8] powerpc/pkeys: Drop private VM_PKEY definitions
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@...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@...erman.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
--
Ram Pai
Powered by blists - more mailing lists