1 files changed, 6 insertions, 3 deletions

diff --git a/mm/debug.c b/mm/debug.c
index 0abb987dad9b..c0b31b6c3877 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -44,7 +44,7 @@ const struct trace_print_flags vmaflag_names[] = {
 
 void __dump_page(struct page *page, const char *reason)
 {
-        struct address_space *mapping = page_mapping(page);
+        struct address_space *mapping;
         bool page_poisoned = PagePoisoned(page);
         int mapcount;
 
@@ -58,6 +58,8 @@ void __dump_page(struct page *page, const char *reason)
                 goto hex_only;
         }
 
+        mapping = page_mapping(page);
+
         /*
          * Avoid VM_BUG_ON() in page_mapcount().
          * page->_mapcount space in struct page is used by sl[aou]b pages to
@@ -135,7 +137,7 @@ void dump_mm(const struct mm_struct *mm)
                 "mmap_base %lu mmap_legacy_base %lu highest_vm_end %lu\n"
                 "pgd %px mm_users %d mm_count %d pgtables_bytes %lu map_count %d\n"
                 "hiwater_rss %lx hiwater_vm %lx total_vm %lx locked_vm %lx\n"
-                "pinned_vm %lx data_vm %lx exec_vm %lx stack_vm %lx\n"
+                "pinned_vm %llx data_vm %lx exec_vm %lx stack_vm %lx\n"
                 "start_code %lx end_code %lx start_data %lx end_data %lx\n"
                 "start_brk %lx brk %lx start_stack %lx\n"
                 "arg_start %lx arg_end %lx env_start %lx env_end %lx\n"
@@ -166,7 +168,8 @@ void dump_mm(const struct mm_struct *mm)
                 mm_pgtables_bytes(mm),
                 mm->map_count,
                 mm->hiwater_rss, mm->hiwater_vm, mm->total_vm, mm->locked_vm,
-                mm->pinned_vm, mm->data_vm, mm->exec_vm, mm->stack_vm,
+                atomic64_read(&mm->pinned_vm),
+                mm->data_vm, mm->exec_vm, mm->stack_vm,
                 mm->start_code, mm->end_code, mm->start_data, mm->end_data,
                 mm->start_brk, mm->brk, mm->start_stack,
                 mm->arg_start, mm->arg_end, mm->env_start, mm->env_end,