| Message ID | 20180508145948.9492-5-mpe@ellerman.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 09, 2018 at 12:59:44AM +1000, Michael Ellerman wrote: > Consolidate the pkey handling by providing a common empty definition > of vma_pkey() in pkeys.h when CONFIG_ARCH_HAS_PKEYS=n. > > This also removes another entanglement of pkeys.h and > asm/mmu_context.h. > Reviewed-by: Ram Pai <linuxram@us.ibm.com> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> > --- > arch/powerpc/include/asm/mmu_context.h | 5 ----- > arch/x86/include/asm/mmu_context.h | 5 ----- > include/linux/pkeys.h | 5 +++++ > 3 files changed, 5 insertions(+), 10 deletions(-) RP
On 05/08/2018 07:59 AM, Michael Ellerman wrote: > Consolidate the pkey handling by providing a common empty definition > of vma_pkey() in pkeys.h when CONFIG_ARCH_HAS_PKEYS=n. > > This also removes another entanglement of pkeys.h and > asm/mmu_context.h. Looks fine to me. Thanks for consolidating these. Reviewed-by: Dave Hansen <dave.hansen@intel.com>
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h index 1835ca1505d6..896efa559996 100644 --- a/arch/powerpc/include/asm/mmu_context.h +++ b/arch/powerpc/include/asm/mmu_context.h @@ -250,11 +250,6 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, #define thread_pkey_regs_restore(new_thread, old_thread) #define thread_pkey_regs_init(thread) -static inline int vma_pkey(struct vm_area_struct *vma) -{ - return 0; -} - static inline u64 pte_to_hpte_pkey_bits(u64 pteflags) { return 0x0UL; diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h index 57e3785d0d26..3d748bdf44a7 100644 --- a/arch/x86/include/asm/mmu_context.h +++ b/arch/x86/include/asm/mmu_context.h @@ -296,11 +296,6 @@ static inline int vma_pkey(struct vm_area_struct *vma) return (vma->vm_flags & vma_pkey_mask) >> VM_PKEY_SHIFT; } -#else -static inline int vma_pkey(struct vm_area_struct *vma) -{ - return 0; -} #endif /* diff --git a/include/linux/pkeys.h b/include/linux/pkeys.h index ed06e1a67bfa..aad54663763b 100644 --- a/include/linux/pkeys.h +++ b/include/linux/pkeys.h @@ -13,6 +13,11 @@ #define PKEY_DEDICATED_EXECUTE_ONLY 0 #define ARCH_VM_PKEY_FLAGS 0 +static inline int vma_pkey(struct vm_area_struct *vma) +{ + return 0; +} + static inline bool mm_pkey_is_allocated(struct mm_struct *mm, int pkey) { return (pkey == 0);
Consolidate the pkey handling by providing a common empty definition of vma_pkey() in pkeys.h when CONFIG_ARCH_HAS_PKEYS=n. This also removes another entanglement of pkeys.h and asm/mmu_context.h. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> --- arch/powerpc/include/asm/mmu_context.h | 5 ----- arch/x86/include/asm/mmu_context.h | 5 ----- include/linux/pkeys.h | 5 +++++ 3 files changed, 5 insertions(+), 10 deletions(-)