1 files changed, 9 insertions, 8 deletions

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 390bdab01c3c..abbe825d20ff 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -561,6 +561,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
                 [ilog2(VM_NONLINEAR)]   = "nl",
                 [ilog2(VM_ARCH_1)]      = "ar",
                 [ilog2(VM_DONTDUMP)]    = "dd",
+#ifdef CONFIG_MEM_SOFT_DIRTY
+                [ilog2(VM_SOFTDIRTY)]   = "sd",
+#endif
                 [ilog2(VM_MIXEDMAP)]    = "mm",
                 [ilog2(VM_HUGEPAGE)]    = "hg",
                 [ilog2(VM_NOHUGEPAGE)]  = "nh",
@@ -1387,8 +1390,8 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
         struct mm_struct *mm = vma->vm_mm;
         struct mm_walk walk = {};
         struct mempolicy *pol;
-        int n;
-        char buffer[50];
+        char buffer[64];
+        int nid;
 
         if (!mm)
                 return 0;
@@ -1404,10 +1407,8 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
         walk.mm = mm;
 
         pol = get_vma_policy(task, vma, vma->vm_start);
-        n = mpol_to_str(buffer, sizeof(buffer), pol);
+        mpol_to_str(buffer, sizeof(buffer), pol);
         mpol_cond_put(pol);
-        if (n < 0)
-                return n;
 
         seq_printf(m, "%08lx %s", vma->vm_start, buffer);
 
@@ -1460,9 +1461,9 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
         if (md->writeback)
                 seq_printf(m, " writeback=%lu", md->writeback);
 
-        for_each_node_state(n, N_MEMORY)
-                if (md->node[n])
-                        seq_printf(m, " N%d=%lu", n, md->node[n]);
+        for_each_node_state(nid, N_MEMORY)
+                if (md->node[nid])
+                        seq_printf(m, " N%d=%lu", nid, md->node[nid]);
 out:
         seq_putc(m, '\n');