Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / fs / proc / nommu.c

diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index ccfd99bd1c5a627e41cae635f4527b8220af109e..5f9bc8a746c93dbfa99678b9a7d91c2a0999fdf9 100644 (file)
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -39,7 +39,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
        unsigned long ino = 0;
        struct file *file;
        dev_t dev = 0;
-       int flags, len;
+       int flags;
 
        flags = region->vm_flags;
        file = region->vm_file;
@@ -50,8 +50,9 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
                ino = inode->i_ino;
        }
 
+       seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
        seq_printf(m,
-                  "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
+                  "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
                   region->vm_start,
                   region->vm_end,
                   flags & VM_READ ? 'r' : '-',
@@ -59,13 +60,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
                   flags & VM_EXEC ? 'x' : '-',
                   flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p',
                   ((loff_t)region->vm_pgoff) << PAGE_SHIFT,
-                  MAJOR(dev), MINOR(dev), ino, &len);
+                  MAJOR(dev), MINOR(dev), ino);
 
        if (file) {
-               len = 25 + sizeof(void *) * 6 - len;
-               if (len < 1)
-                       len = 1;
-               seq_printf(m, "%*c", len, ' ');
+               seq_pad(m, ' ');
                seq_path(m, &file->f_path, "");
        }