summary refs log tree commit diff
path: root/arch/powerpc/include/asm/mmu_context.h
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2018-04-11 23:41:42 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2018-05-09 11:50:41 +1000
commitdbec10e58deadba596d59a0ab4a394fef271992f (patch)
treeab9cdbcbbe1989a41bd06df29e5363f94e23a9a5 /arch/powerpc/include/asm/mmu_context.h
parentcd419a513146367af08b895a8f7d360e4e77b638 (diff)
downloadlinux-dbec10e58deadba596d59a0ab4a394fef271992f.tar.gz
mm/pkeys, powerpc, x86: Provide an empty vma_pkey() in linux/pkeys.h
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>
Reviewed-by: Ram Pai <linuxram@us.ibm.com>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Diffstat (limited to 'arch/powerpc/include/asm/mmu_context.h')
-rw-r--r--arch/powerpc/include/asm/mmu_context.h5
1 files changed, 0 insertions, 5 deletions
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;