Merge commit 'v2.6.29-rc1' into timers/hrtimers

Conflicts:
	kernel/time/tick-common.c

1 files changed, 6 insertions, 0 deletions

diff --git a/fs/compat.c b/fs/compat.c
index d1ece79b6411..30f2faa22f5c 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1187,6 +1187,9 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec, unsign
         ret = compat_do_readv_writev(READ, file, vec, vlen, &file->f_pos);
 
 out:
+        if (ret > 0)
+                add_rchar(current, ret);
+        inc_syscr(current);
         fput(file);
         return ret;
 }
@@ -1210,6 +1213,9 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, unsig
         ret = compat_do_readv_writev(WRITE, file, vec, vlen, &file->f_pos);
 
 out:
+        if (ret > 0)
+                add_wchar(current, ret);
+        inc_syscw(current);
         fput(file);
         return ret;
 }