1 files changed, 14 insertions, 0 deletions

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index fa95ab2d3674..9df431642042 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -660,11 +660,20 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
                 [ilog2(VM_MERGEABLE)]   = "mg",
                 [ilog2(VM_UFFD_MISSING)]= "um",
                 [ilog2(VM_UFFD_WP)]     = "uw",
+#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
+                /* These come out via ProtectionKey: */
+                [ilog2(VM_PKEY_BIT0)]   = "",
+                [ilog2(VM_PKEY_BIT1)]   = "",
+                [ilog2(VM_PKEY_BIT2)]   = "",
+                [ilog2(VM_PKEY_BIT3)]   = "",
+#endif
         };
         size_t i;
 
         seq_puts(m, "VmFlags: ");
         for (i = 0; i < BITS_PER_LONG; i++) {
+                if (!mnemonics[i][0])
+                        continue;
                 if (vma->vm_flags & (1UL << i)) {
                         seq_printf(m, "%c%c ",
                                    mnemonics[i][0], mnemonics[i][1]);
@@ -702,6 +711,10 @@ static int smaps_hugetlb_range(pte_t *pte, unsigned long hmask,
 }
 #endif /* HUGETLB_PAGE */
 
+void __weak arch_show_smap(struct seq_file *m, struct vm_area_struct *vma)
+{
+}
+
 static int show_smap(struct seq_file *m, void *v, int is_pid)
 {
         struct vm_area_struct *vma = v;
@@ -783,6 +796,7 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
                    (vma->vm_flags & VM_LOCKED) ?
                         (unsigned long)(mss.pss >> (10 + PSS_SHIFT)) : 0);
 
+        arch_show_smap(m, vma);
         show_smap_vma_flags(m, vma);
         m_cache_vma(m, vma);
         return 0;