---

yaml --- r: 371143 b: refs/heads/master c: 772c808 h: refs/heads/master i: 371141: 5a9f268 371139: db0d3f7 371135: 45a20ab v: v3
git-mirror · Apr 30, 2013 · 3e07bb5 · 3e07bb5
1 parent 513c40e
commit 3e07bb5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55eaa7c1f511af5fb6ef808b5328804f4d4e5243
+refs/heads/master: 772c808a252594692972773f6ee41c289b8e0b2a
diff --git a/trunk/kernel/sched/cputime.c b/trunk/kernel/sched/cputime.c
@@ -581,6 +581,14 @@ static void cputime_adjust(struct task_cputime *curr,
 	 */
 	rtime = nsecs_to_cputime(curr->sum_exec_runtime);
 
+	/*
+	 * Update userspace visible utime/stime values only if actual execution
+	 * time is bigger than already exported. Note that can happen, that we
+	 * provided bigger values due to scaling inaccuracy on big numbers.
+	 */
+	if (prev->stime + prev->utime >= rtime)
+		goto out;
+
 	if (!rtime) {
 		stime = 0;
 	} else if (!total) {
@@ -598,6 +606,7 @@ static void cputime_adjust(struct task_cputime *curr,
 	prev->stime = max(prev->stime, stime);
 	prev->utime = max(prev->utime, rtime - prev->stime);
 
+out:
 	*ut = prev->utime;
 	*st = prev->stime;
 }