diff options
author | Ram Pai <linuxram@us.ibm.com> | 2018-04-13 23:55:07 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-05-09 11:51:49 +1000 |
commit | 27cca866e3fce0961e13b38b87e5322fe153e437 (patch) | |
tree | 8c2ac6a3054fb393b99cacd2e214c60e6ae280ff /arch/x86/kernel | |
parent | 4414ef9536c398ebc4e1443d59fbae8fea53732b (diff) | |
download | linux-stable-27cca866e3fce0961e13b38b87e5322fe153e437.tar.gz linux-stable-27cca866e3fce0961e13b38b87e5322fe153e437.tar.bz2 linux-stable-27cca866e3fce0961e13b38b87e5322fe153e437.zip |
mm/pkeys, x86, powerpc: Display pkey in smaps if arch supports pkeys
Currently the architecture specific code is expected to display the
protection keys in smap for a given vma. This can lead to redundant
code and possibly to divergent formats in which the key gets
displayed.
This patch changes the implementation. It displays the pkey only if
the architecture support pkeys, i.e arch_pkeys_enabled() returns true.
x86 arch_show_smap() function is not needed anymore, delete it.
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
[mpe: Split out from larger patch, rebased on header changes]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/setup.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 5c623dfe39d1..2f86d883dd95 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1312,11 +1312,3 @@ static int __init register_kernel_offset_dumper(void) return 0; } __initcall(register_kernel_offset_dumper); - -void arch_show_smap(struct seq_file *m, struct vm_area_struct *vma) -{ - if (!boot_cpu_has(X86_FEATURE_OSPKE)) - return; - - seq_printf(m, "ProtectionKey: %8u\n", vma_pkey(vma)); -} |