fix refrigerator() vs thaw_process() race

[powerpc.git] / kernel / tsacct.c

diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index 65a5036..658f638 100644 (file)
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
@@ -22,8 +22,6 @@
 #include <linux/acct.h>
 #include <linux/jiffies.h>
 
-
-#define USEC_PER_TICK  (USEC_PER_SEC/HZ)
 /*
  * fill in basic accounting fields
  */
@@ -80,18 +78,31 @@ void bacct_add_tsk(struct taskstats *stats, struct task_struct *tsk)
  */
 void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
 {
+       struct mm_struct *mm;
+
        /* convert pages-jiffies to Mbyte-usec */
        stats->coremem = jiffies_to_usecs(p->acct_rss_mem1) * PAGE_SIZE / MB;
        stats->virtmem = jiffies_to_usecs(p->acct_vm_mem1) * PAGE_SIZE / MB;
-       if (p->mm) {
+       mm = get_task_mm(p);
+       if (mm) {
                /* adjust to KB unit */
-               stats->hiwater_rss   = p->mm->hiwater_rss * PAGE_SIZE / KB;
-               stats->hiwater_vm    = p->mm->hiwater_vm * PAGE_SIZE / KB;
+               stats->hiwater_rss   = mm->hiwater_rss * PAGE_SIZE / KB;
+               stats->hiwater_vm    = mm->hiwater_vm * PAGE_SIZE / KB;
+               mmput(mm);
        }
        stats->read_char        = p->rchar;
        stats->write_char       = p->wchar;
        stats->read_syscalls    = p->syscr;
        stats->write_syscalls   = p->syscw;
+#ifdef CONFIG_TASK_IO_ACCOUNTING
+       stats->read_bytes       = p->ioac.read_bytes;
+       stats->write_bytes      = p->ioac.write_bytes;
+       stats->cancelled_write_bytes = p->ioac.cancelled_write_bytes;
+#else
+       stats->read_bytes       = 0;
+       stats->write_bytes      = 0;
+       stats->cancelled_write_bytes = 0;
+#endif
 }
 #undef KB
 #undef MB