Patched to 2.6.10-1.14_FC2.

[linux-2.6.git] / fs / proc / task_mmu.c

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 43301d8..def2511 100644 (file)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -6,27 +6,11 @@
 
 char *task_mem(struct mm_struct *mm, char *buffer)
 {
-       unsigned long data = 0, stack = 0, exec = 0, lib = 0;
-       struct vm_area_struct *vma;
+       unsigned long data, text, lib;
 
-       down_read(&mm->mmap_sem);
-       for (vma = mm->mmap; vma; vma = vma->vm_next) {
-               unsigned long len = (vma->vm_end - vma->vm_start) >> 10;
-               if (!vma->vm_file) {
-                       data += len;
-                       if (vma->vm_flags & VM_GROWSDOWN)
-                               stack += len;
-                       continue;
-               }
-               if (vma->vm_flags & VM_WRITE)
-                       continue;
-               if (vma->vm_flags & VM_EXEC) {
-                       exec += len;
-                       if (vma->vm_flags & VM_EXECUTABLE)
-                               continue;
-                       lib += len;
-               }
-       }
+       data = mm->total_vm - mm->shared_vm - mm->stack_vm;
+       text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK)) >> 10;
+       lib = (mm->exec_vm << (PAGE_SHIFT-10)) - text;
        buffer += sprintf(buffer,
                "VmSize:\t%8lu kB\n"
                "VmLck:\t%8lu kB\n"
@@ -35,23 +19,23 @@ char *task_mem(struct mm_struct *mm, char *buffer)
                "VmStk:\t%8lu kB\n"
                "VmExe:\t%8lu kB\n"
                "VmLib:\t%8lu kB\n"
+               "VmPTE:\t%8lu kB\n"
                "StaBrk:\t%08lx kB\n"
                "Brk:\t%08lx kB\n"
                "StaStk:\t%08lx kB\n"
-#if __i386__
-               "ExecLim:\t%08lx\n"
-#endif
                ,
-               mm->total_vm << (PAGE_SHIFT-10),
+               (mm->total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
                mm->locked_vm << (PAGE_SHIFT-10),
                mm->rss << (PAGE_SHIFT-10),
-               data - stack, stack,
-               exec - lib, lib, mm->start_brk, mm->brk, mm->start_stack
+               data << (PAGE_SHIFT-10),
+               mm->stack_vm << (PAGE_SHIFT-10), text, lib,
+               (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
+               mm->start_brk, mm->brk, mm->start_stack);
 #if __i386__
-               , mm->context.exec_limit
+       if (!nx_enabled)
+               buffer += sprintf(buffer,
+                               "ExecLim:\t%08lx\n", mm->context.exec_limit);
 #endif
-               );
-       up_read(&mm->mmap_sem);
        return buffer;
 }
 
@@ -63,32 +47,19 @@ unsigned long task_vsize(struct mm_struct *mm)
 int task_statm(struct mm_struct *mm, int *shared, int *text,
               int *data, int *resident)
 {
-       struct vm_area_struct *vma;
-       int size = 0;
-
+       *shared = mm->rss - mm->anon_rss;
+       *text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK))
+                                                               >> PAGE_SHIFT;
+       *data = mm->total_vm - mm->shared_vm;
        *resident = mm->rss;
-       for (vma = mm->mmap; vma; vma = vma->vm_next) {
-               int pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-
-               size += pages;
-               if (is_vm_hugetlb_page(vma)) {
-                       if (!(vma->vm_flags & VM_DONTCOPY))
-                               *shared += pages;
-                       continue;
-               }
-               if (vma->vm_file)
-                       *shared += pages;
-               if (vma->vm_flags & VM_EXECUTABLE)
-                       *text += pages;
-               else
-                       *data += pages;
-       }
-
-       return size;
+       return mm->total_vm;
 }
 
 static int show_map(struct seq_file *m, void *v)
 {
+#ifdef __i386__
+       struct task_struct *task = m->private;
+#endif
        struct vm_area_struct *map = v;
        struct file *file = map->vm_file;
        int flags = map->vm_flags;
@@ -107,7 +78,13 @@ static int show_map(struct seq_file *m, void *v)
                        map->vm_end,
                        flags & VM_READ ? 'r' : '-',
                        flags & VM_WRITE ? 'w' : '-',
-                       flags & VM_EXEC ? 'x' : '-',
+                       (flags & VM_EXEC
+#ifdef __i386__
+                               || (!nx_enabled &&
+                               (map->vm_start < task->mm->context.exec_limit))
+#endif
+                       )
+                               ? 'x' : '-',
                        flags & VM_MAYSHARE ? 's' : 'p',
                        map->vm_pgoff << PAGE_SHIFT,
                        MAJOR(dev), MINOR(dev), ino, &len);