diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 13:35:27 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 13:35:27 +0300 |
| commit | 2135a6ec3eb9633727f657f020e27048fb7c105a (patch) | |
| tree | df8f9c831e1b28b274df6cbb478d317aaecbc99b /arch/powerpc/include/asm/mmu_context.h | |
| parent | f1079d3a3d1f468f8faa3f506c163d44fac01912 (diff) | |
| parent | d86a4ba02fc6bea4670b2f59b208152a4a34c3c0 (diff) | |
| download | linux-2135a6ec3eb9633727f657f020e27048fb7c105a.tar.xz | |
Merge branch 'topic/pkey' into next
This is a branch with a mixture of mm, x86 and powerpc commits all
relating to some minor cross-arch pkeys consolidation. The x86/mm
changes have been reviewed by Ingo & Dave Hansen and the tree has been
in linux-next for some weeks without issue.
Diffstat (limited to 'arch/powerpc/include/asm/mmu_context.h')
| -rw-r--r-- | arch/powerpc/include/asm/mmu_context.h | 5 |
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; |