Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[~andy/linux] / kernel / delayacct.c

diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index b3179dad71be87d1f0d17258f82286abce3d9c47..ead9b610aa71af7b1bd689c50ee616cf142e64cc 100644 (file)
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -15,6 +15,7 @@
 
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/taskstats.h>
 #include <linux/time.h>
 #include <linux/sysctl.h>
 #include <linux/delayacct.h>
@@ -127,7 +128,7 @@ int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
         */
        t1 = tsk->sched_info.pcount;
        t2 = tsk->sched_info.run_delay;
-       t3 = tsk->sched_info.cpu_time;
+       t3 = tsk->se.sum_exec_runtime;
 
        d->cpu_count += t1;