rxrpc: Fix a bit of time confusion

[uclinux-h8/linux.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 4c12cb2..9298324 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -75,6 +75,7 @@
 #include <linux/ptrace.h>
 #include <linux/tracehook.h>
 #include <linux/printk.h>
+#include <linux/cache.h>
 #include <linux/cgroup.h>
 #include <linux/cpuset.h>
 #include <linux/audit.h>
@@ -112,8 +113,8 @@
  *     in /proc for a task before it execs a suid executable.
  */
 
-static u8 nlink_tid;
-static u8 nlink_tgid;
+static u8 nlink_tid __ro_after_init;
+static u8 nlink_tgid __ro_after_init;
 
 struct pid_entry {
        const char *name;
@@ -2026,9 +2027,9 @@ out:
 }
 
 struct map_files_info {
+       unsigned long   start;
+       unsigned long   end;
        fmode_t         mode;
-       unsigned int    len;
-       unsigned char   name[4*sizeof(long)+2]; /* max: %lx-%lx\0 */
 };
 
 /*
@@ -2198,10 +2199,9 @@ proc_map_files_readdir(struct file *file, struct dir_context *ctx)
                        if (++pos <= ctx->pos)
                                continue;
 
+                       info.start = vma->vm_start;
+                       info.end = vma->vm_end;
                        info.mode = vma->vm_file->f_mode;
-                       info.len = snprintf(info.name,
-                                       sizeof(info.name), "%lx-%lx",
-                                       vma->vm_start, vma->vm_end);
                        if (flex_array_put(fa, i++, &info, GFP_KERNEL))
                                BUG();
                }
@@ -2209,9 +2209,13 @@ proc_map_files_readdir(struct file *file, struct dir_context *ctx)
        up_read(&mm->mmap_sem);
 
        for (i = 0; i < nr_files; i++) {
+               char buf[4 * sizeof(long) + 2]; /* max: %lx-%lx\0 */
+               unsigned int len;
+
                p = flex_array_get(fa, i);
+               len = snprintf(buf, sizeof(buf), "%lx-%lx", p->start, p->end);
                if (!proc_fill_cache(file, ctx,
-                                     p->name, p->len,
+                                     buf, len,
                                      proc_map_files_instantiate,
                                      task,
                                      (void *)(unsigned long)p->mode))