Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 7 insertions, 0 deletions

diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index 54996b7..d473988 100644
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -108,6 +108,12 @@ 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);
@@ -152,6 +158,7 @@ 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;
 }