diff options
| author | Ram Pai <linuxram@us.ibm.com> | 2018-01-19 02:50:33 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-20 12:59:01 +0100 |
| commit | 013a91b39c2d5158cdc5529803f245bbb0526c7c (patch) | |
| tree | dd2f86dc2e39316ea4f1bb2e689ec41fbf695480 /arch/powerpc/include/asm/mman.h | |
| parent | powerpc: introduce execute-only pkey (diff) | |
| download | linux-013a91b39c2d5158cdc5529803f245bbb0526c7c.tar.xz linux-013a91b39c2d5158cdc5529803f245bbb0526c7c.zip | |
powerpc: ability to associate pkey to a vma
arch-independent code expects the arch to map
a pkey into the vma's protection bit setting.
The patch provides that ability.
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/include/asm/mman.h')
| -rw-r--r-- | arch/powerpc/include/asm/mman.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h index 30922f699341..29994788b9f3 100644 --- a/arch/powerpc/include/asm/mman.h +++ b/arch/powerpc/include/asm/mman.h @@ -13,6 +13,7 @@ #include <asm/cputable.h> #include <linux/mm.h> +#include <linux/pkeys.h> #include <asm/cpu_has_feature.h> /* @@ -22,7 +23,11 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, unsigned long pkey) { - return (prot & PROT_SAO) ? VM_SAO : 0; +#ifdef CONFIG_PPC_MEM_KEYS + return (((prot & PROT_SAO) ? VM_SAO : 0) | pkey_to_vmflag_bits(pkey)); +#else + return ((prot & PROT_SAO) ? VM_SAO : 0); +#endif } #define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey) |