Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[uclinux-h8/linux.git] / fs / proc / task_mmu.c

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index ca1e091..3b4d825 100644 (file)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -597,6 +597,8 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
                [ilog2(VM_HUGEPAGE)]    = "hg",
                [ilog2(VM_NOHUGEPAGE)]  = "nh",
                [ilog2(VM_MERGEABLE)]   = "mg",
+               [ilog2(VM_UFFD_MISSING)]= "um",
+               [ilog2(VM_UFFD_WP)]     = "uw",
        };
        size_t i;