aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index cdb7e9457ba6..ec319bbb0bd4 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -29,6 +29,7 @@
29#include <linux/signal.h> 29#include <linux/signal.h>
30#include <linux/cn_proc.h> 30#include <linux/cn_proc.h>
31#include <linux/getcpu.h> 31#include <linux/getcpu.h>
32#include <linux/task_io_accounting_ops.h>
32 33
33#include <linux/compat.h> 34#include <linux/compat.h>
34#include <linux/syscalls.h> 35#include <linux/syscalls.h>
@@ -2082,6 +2083,8 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
2082 r->ru_nivcsw = p->signal->cnivcsw; 2083 r->ru_nivcsw = p->signal->cnivcsw;
2083 r->ru_minflt = p->signal->cmin_flt; 2084 r->ru_minflt = p->signal->cmin_flt;
2084 r->ru_majflt = p->signal->cmaj_flt; 2085 r->ru_majflt = p->signal->cmaj_flt;
2086 r->ru_inblock = p->signal->cinblock;
2087 r->ru_oublock = p->signal->coublock;
2085 2088
2086 if (who == RUSAGE_CHILDREN) 2089 if (who == RUSAGE_CHILDREN)
2087 break; 2090 break;
@@ -2093,6 +2096,8 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
2093 r->ru_nivcsw += p->signal->nivcsw; 2096 r->ru_nivcsw += p->signal->nivcsw;
2094 r->ru_minflt += p->signal->min_flt; 2097 r->ru_minflt += p->signal->min_flt;
2095 r->ru_majflt += p->signal->maj_flt; 2098 r->ru_majflt += p->signal->maj_flt;
2099 r->ru_inblock += p->signal->inblock;
2100 r->ru_oublock += p->signal->oublock;
2096 t = p; 2101 t = p;
2097 do { 2102 do {
2098 utime = cputime_add(utime, t->utime); 2103 utime = cputime_add(utime, t->utime);
@@ -2101,6 +2106,8 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
2101 r->ru_nivcsw += t->nivcsw; 2106 r->ru_nivcsw += t->nivcsw;
2102 r->ru_minflt += t->min_flt; 2107 r->ru_minflt += t->min_flt;
2103 r->ru_majflt += t->maj_flt; 2108 r->ru_majflt += t->maj_flt;
2109 r->ru_inblock += task_io_get_inblock(t);
2110 r->ru_oublock += task_io_get_oublock(t);
2104 t = next_thread(t); 2111 t = next_thread(t);
2105 } while (t != p); 2112 } while (t != p);
2106 break; 2113 break;