diff --git a/[refs] b/[refs] index d6bf841b7ea7..ac6a1bc5b1ff 100644 --- 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 index e9198abfca53..1b7c2161f5cd 100644 --- 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; }