summaryrefslogtreecommitdiff
path: root/fs/proc
diff options
context:
space:
mode:
authorRam Pai <linuxram@us.ibm.com>2018-03-27 12:09:27 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2018-05-09 04:50:27 +0300
commit2c9e0a6fa2bb75697981825153128f43b32f6d08 (patch)
tree663f1f94021b3c9bd6638a8ff6f83ad2d47c6868 /fs/proc
parent5212213aa5a2359dd0474c9dab22b6220b591fe1 (diff)
downloadlinux-2c9e0a6fa2bb75697981825153128f43b32f6d08.tar.xz
mm, powerpc, x86: introduce an additional vma bit for powerpc pkey
Currently only 4bits are allocated in the vma flags to hold 16 keys. This is sufficient for x86. PowerPC supports 32 keys, which needs 5bits. This patch allocates an additional bit. Reviewed-by: Ingo Molnar <mingo@kernel.org> Acked-by: Balbir Singh <bsingharora@gmail.com> Signed-off-by: Ram Pai <linuxram@us.ibm.com> [mpe: Fold in #if VM_PKEY_BIT4 as noticed by Dave Hansen] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/task_mmu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 541392a62608..c2163606e6fb 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -679,6 +679,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
[ilog2(VM_PKEY_BIT1)] = "",
[ilog2(VM_PKEY_BIT2)] = "",
[ilog2(VM_PKEY_BIT3)] = "",
+#if VM_PKEY_BIT4
+ [ilog2(VM_PKEY_BIT4)] = "",
+#endif
#endif /* CONFIG_ARCH_HAS_PKEYS */
};
size_t i;