diff options
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index b0c6f0c3a2df..7a5fd77f8fb0 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <linux/audit.h> /* for audit_free() */ | 42 | #include <linux/audit.h> /* for audit_free() */ |
43 | #include <linux/resource.h> | 43 | #include <linux/resource.h> |
44 | #include <linux/blkdev.h> | 44 | #include <linux/blkdev.h> |
45 | #include <linux/task_io_accounting_ops.h> | ||
45 | 46 | ||
46 | #include <asm/uaccess.h> | 47 | #include <asm/uaccess.h> |
47 | #include <asm/unistd.h> | 48 | #include <asm/unistd.h> |
@@ -113,6 +114,8 @@ static void __exit_signal(struct task_struct *tsk) | |||
113 | sig->nvcsw += tsk->nvcsw; | 114 | sig->nvcsw += tsk->nvcsw; |
114 | sig->nivcsw += tsk->nivcsw; | 115 | sig->nivcsw += tsk->nivcsw; |
115 | sig->sched_time += tsk->sched_time; | 116 | sig->sched_time += tsk->sched_time; |
117 | sig->inblock += task_io_get_inblock(tsk); | ||
118 | sig->oublock += task_io_get_oublock(tsk); | ||
116 | sig = NULL; /* Marker for below. */ | 119 | sig = NULL; /* Marker for below. */ |
117 | } | 120 | } |
118 | 121 | ||
@@ -1193,6 +1196,12 @@ static int wait_task_zombie(struct task_struct *p, int noreap, | |||
1193 | p->nvcsw + sig->nvcsw + sig->cnvcsw; | 1196 | p->nvcsw + sig->nvcsw + sig->cnvcsw; |
1194 | psig->cnivcsw += | 1197 | psig->cnivcsw += |
1195 | p->nivcsw + sig->nivcsw + sig->cnivcsw; | 1198 | p->nivcsw + sig->nivcsw + sig->cnivcsw; |
1199 | psig->cinblock += | ||
1200 | task_io_get_inblock(p) + | ||
1201 | sig->inblock + sig->cinblock; | ||
1202 | psig->coublock += | ||
1203 | task_io_get_oublock(p) + | ||
1204 | sig->oublock + sig->coublock; | ||
1196 | spin_unlock_irq(&p->parent->sighand->siglock); | 1205 | spin_unlock_irq(&p->parent->sighand->siglock); |
1197 | } | 1206 | } |
1198 | 1207 | ||