diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-04-11 23:41:42 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-05-09 11:50:41 +1000 |
| commit | dbec10e58deadba596d59a0ab4a394fef271992f (patch) | |
| tree | ab9cdbcbbe1989a41bd06df29e5363f94e23a9a5 /arch/x86/include/asm/mmu_context.h | |
| parent | cd419a513146367af08b895a8f7d360e4e77b638 (diff) | |
| download | linux-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/x86/include/asm/mmu_context.h')
| -rw-r--r-- | arch/x86/include/asm/mmu_context.h | 5 |
1 files changed, 0 insertions, 5 deletions
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 /* |