1 files changed, 26 insertions, 26 deletions

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 791b2d400be5..abc44f39f1d6 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -145,7 +145,7 @@ struct mem_size_stats
         u64 pss;
 };
 
-static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats *mss)
+static int show_map(struct seq_file *m, void *v)
 {
         struct proc_maps_private *priv = m->private;
         struct task_struct *task = priv->task;
@@ -205,35 +205,11 @@ static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats
         }
         seq_putc(m, '\n');
 
-        if (mss)
-                seq_printf(m,
-                           "Size:           %8lu kB\n"
-                           "Rss:            %8lu kB\n"
-                           "Pss:            %8lu kB\n"
-                           "Shared_Clean:   %8lu kB\n"
-                           "Shared_Dirty:   %8lu kB\n"
-                           "Private_Clean:  %8lu kB\n"
-                           "Private_Dirty:  %8lu kB\n"
-                           "Referenced:     %8lu kB\n",
-                           (vma->vm_end - vma->vm_start) >> 10,
-                           mss->resident >> 10,
-                           (unsigned long)(mss->pss >> (10 + PSS_SHIFT)),
-                           mss->shared_clean  >> 10,
-                           mss->shared_dirty  >> 10,
-                           mss->private_clean >> 10,
-                           mss->private_dirty >> 10,
-                           mss->referenced >> 10);
-
         if (m->count < m->size)  /* vma is copied successfully */
                 m->version = (vma != get_gate_vma(task))? vma->vm_start: 0;
         return 0;
 }
 
-static int show_map(struct seq_file *m, void *v)
-{
-        return show_map_internal(m, v, NULL);
-}
-
 static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
                            void *private)
 {
@@ -312,13 +288,37 @@ static int show_smap(struct seq_file *m, void *v)
 {
         struct vm_area_struct *vma = v;
         struct mem_size_stats mss;
+        int ret;
 
         memset(&mss, 0, sizeof mss);
         mss.vma = vma;
         if (vma->vm_mm && !is_vm_hugetlb_page(vma))
                 walk_page_range(vma->vm_mm, vma->vm_start, vma->vm_end,
                                 &smaps_walk, &mss);
-        return show_map_internal(m, v, &mss);
+
+        ret = show_map(m, v);
+        if (ret)
+                return ret;
+
+        seq_printf(m,
+                   "Size:           %8lu kB\n"
+                   "Rss:            %8lu kB\n"
+                   "Pss:            %8lu kB\n"
+                   "Shared_Clean:   %8lu kB\n"
+                   "Shared_Dirty:   %8lu kB\n"
+                   "Private_Clean:  %8lu kB\n"
+                   "Private_Dirty:  %8lu kB\n"
+                   "Referenced:     %8lu kB\n",
+                   (vma->vm_end - vma->vm_start) >> 10,
+                   mss.resident >> 10,
+                   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
+                   mss.shared_clean  >> 10,
+                   mss.shared_dirty  >> 10,
+                   mss.private_clean >> 10,
+                   mss.private_dirty >> 10,
+                   mss.referenced >> 10);
+
+        return ret;
 }
 
 static struct mm_walk clear_refs_walk = { .pmd_entry = clear_refs_pte_range };