Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index d473988c1d0bc7505db5cbd17f637787bcdd3d1c..54996b71e66d82817cc16ed1963c1490c7dd4db4 100644 (file)
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -108,12 +108,6 @@ int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
        struct timespec ts;
        cputime_t utime, stime, stimescaled, utimescaled;
 
-       /* Though tsk->delays accessed later, early exit avoids
-        * unnecessary returning of other data
-        */
-       if (!tsk->delays)
-               goto done;
-
        tmp = (s64)d->cpu_run_real_total;
        task_cputime(tsk, &utime, &stime);
        cputime_to_timespec(utime + stime, &ts);
@@ -158,7 +152,6 @@ int __delayacct_add_tsk(struct taskstats *d, struct task_struct *tsk)
        d->freepages_count += tsk->delays->freepages_count;
        spin_unlock_irqrestore(&tsk->delays->lock, flags);
 
-done:
        return 0;
 }