Merge branch 'linus' into x86/urgent, to merge dependent patch

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/debug.c b/mm/debug.c
index 0e58f3211f89..3eb3ac2fcee7 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -130,7 +130,6 @@ static const struct trace_print_flags vmaflags_names[] = {
         {VM_ACCOUNT,                    "account"       },
         {VM_NORESERVE,                  "noreserve"     },
         {VM_HUGETLB,                    "hugetlb"       },
-        {VM_NONLINEAR,                  "nonlinear"     },
 #if defined(CONFIG_X86)
         {VM_PAT,                        "pat"           },
 #elif defined(CONFIG_PPC)
@@ -174,7 +173,7 @@ void dump_mm(const struct mm_struct *mm)
                 "get_unmapped_area %p\n"
 #endif
                 "mmap_base %lu mmap_legacy_base %lu highest_vm_end %lu\n"
-                "pgd %p mm_users %d mm_count %d nr_ptes %lu map_count %d\n"
+                "pgd %p mm_users %d mm_count %d nr_ptes %lu nr_pmds %lu map_count %d\n"
                 "hiwater_rss %lx hiwater_vm %lx total_vm %lx locked_vm %lx\n"
                 "pinned_vm %lx shared_vm %lx exec_vm %lx stack_vm %lx\n"
                 "start_code %lx end_code %lx start_data %lx end_data %lx\n"
@@ -207,6 +206,7 @@ void dump_mm(const struct mm_struct *mm)
                 mm->pgd, atomic_read(&mm->mm_users),
                 atomic_read(&mm->mm_count),
                 atomic_long_read((atomic_long_t *)&mm->nr_ptes),
+                mm_nr_pmds((struct mm_struct *)mm),
                 mm->map_count,
                 mm->hiwater_rss, mm->hiwater_vm, mm->total_vm, mm->locked_vm,
                 mm->pinned_vm, mm->shared_vm, mm->exec_vm, mm->stack_vm,