clocksource: SuperH TMU Timer driver

[safe/jmp/linux-2.6] / fs / proc / task_nommu.c

diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index ca4a48d..64a72e2 100644 (file)
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -2,6 +2,7 @@
 #include <linux/mm.h>
 #include <linux/file.h>
 #include <linux/fdtable.h>
+#include <linux/fs_struct.h>
 #include <linux/mount.h>
 #include <linux/ptrace.h>
 #include <linux/seq_file.h>
@@ -16,24 +17,31 @@
 void task_mem(struct seq_file *m, struct mm_struct *mm)
 {
        struct vm_area_struct *vma;
+       struct vm_region *region;
        struct rb_node *p;
-       unsigned long bytes = 0, sbytes = 0, slack = 0;
+       unsigned long bytes = 0, sbytes = 0, slack = 0, size;
         
        down_read(&mm->mmap_sem);
        for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) {
                vma = rb_entry(p, struct vm_area_struct, vm_rb);
 
                bytes += kobjsize(vma);
+
+               region = vma->vm_region;
+               if (region) {
+                       size = kobjsize(region);
+                       size += region->vm_end - region->vm_start;
+               } else {
+                       size = vma->vm_end - vma->vm_start;
+               }
+
                if (atomic_read(&mm->mm_count) > 1 ||
-                   vma->vm_region ||
                    vma->vm_flags & VM_MAYSHARE) {
-                       sbytes += kobjsize((void *) vma->vm_start);
-                       if (vma->vm_region)
-                               sbytes += kobjsize(vma->vm_region);
+                       sbytes += size;
                } else {
-                       bytes += kobjsize((void *) vma->vm_start);
-                       slack += kobjsize((void *) vma->vm_start) -
-                               (vma->vm_end - vma->vm_start);
+                       bytes += size;
+                       if (region)
+                               slack = region->vm_end - vma->vm_end;
                }
        }
 
@@ -42,7 +50,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
        else
                bytes += kobjsize(mm);
        
-       if (current->fs && atomic_read(&current->fs->count) > 1)
+       if (current->fs && current->fs->users > 1)
                sbytes += kobjsize(current->fs);
        else
                bytes += kobjsize(current->fs);
@@ -77,7 +85,7 @@ unsigned long task_vsize(struct mm_struct *mm)
        down_read(&mm->mmap_sem);
        for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) {
                vma = rb_entry(p, struct vm_area_struct, vm_rb);
-               vsize += vma->vm_region->vm_end - vma->vm_region->vm_start;
+               vsize += vma->vm_end - vma->vm_start;
        }
        up_read(&mm->mmap_sem);
        return vsize;
@@ -87,6 +95,7 @@ int task_statm(struct mm_struct *mm, int *shared, int *text,
               int *data, int *resident)
 {
        struct vm_area_struct *vma;
+       struct vm_region *region;
        struct rb_node *p;
        int size = kobjsize(mm);
 
@@ -94,7 +103,11 @@ int task_statm(struct mm_struct *mm, int *shared, int *text,
        for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) {
                vma = rb_entry(p, struct vm_area_struct, vm_rb);
                size += kobjsize(vma);
-               size += kobjsize((void *) vma->vm_start);
+               region = vma->vm_region;
+               if (region) {
+                       size += kobjsize(region);
+                       size += region->vm_end - region->vm_start;
+               }
        }
 
        size += (*text = mm->end_code - mm->start_code);
@@ -113,6 +126,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
        struct file *file;
        dev_t dev = 0;
        int flags, len;
+       unsigned long long pgoff = 0;
 
        flags = vma->vm_flags;
        file = vma->vm_file;
@@ -121,17 +135,18 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
                struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
                dev = inode->i_sb->s_dev;
                ino = inode->i_ino;
+               pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
        }
 
        seq_printf(m,
-                  "%08lx-%08lx %c%c%c%c %08lx %02x:%02x %lu %n",
+                  "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
                   vma->vm_start,
                   vma->vm_end,
                   flags & VM_READ ? 'r' : '-',
                   flags & VM_WRITE ? 'w' : '-',
                   flags & VM_EXEC ? 'x' : '-',
                   flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p',
-                  vma->vm_pgoff << PAGE_SHIFT,
+                  pgoff,
                   MAJOR(dev), MINOR(dev), ino, &len);
 
        if (file) {