X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=kernel%2Ftsacct.c;h=658f638c402c48fbb307b1a8242c6dfe16d9a1ac;hb=820de5c39ef7f6866d2c9e6c7d208bcd2a6e1942;hp=96f77013d3f038ea03b688c448e2ef69a77aee06;hpb=f0ec1aaf54caddd21c259aea8b2ecfbde4ee4fb9;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index 96f77013d3f..658f638c402 100644
--- 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
  */
@@ -96,6 +94,15 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
 	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