public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse source 
Pull cputime fix from Ingo Molnar:
 "This fixes a longer-standing cputime accounting bug that Stanislaw
  Gruszka finally managed to track down"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/cputime: Do not scale when utime == 0
This commit is contained in:
Linus Torvalds 2013-09-05 12:36:46 -07:00
commit 57d730924d
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kernel/sched/cputime.c
View file

@ -551,10 +551,7 @@ static void cputime_adjust(struct task_cputime *curr,
struct cputime *prev, struct cputime *prev,
cputime_t *ut, cputime_t *st) cputime_t *ut, cputime_t *st)
{ {
cputime_t rtime, stime, utime, total; cputime_t rtime, stime, utime;
stime = curr->stime;
total = stime + curr->utime;
/* /*
* Tick based cputime accounting depend on random scheduling * Tick based cputime accounting depend on random scheduling
@ -576,13 +573,19 @@ static void cputime_adjust(struct task_cputime *curr,
if (prev->stime + prev->utime >= rtime) if (prev->stime + prev->utime >= rtime)
goto out; goto out;
if (total) { stime = curr->stime;
utime = curr->utime;
if (utime == 0) {
stime = rtime;
} else if (stime == 0) {
utime = rtime;
} else {
cputime_t total = stime + utime;
stime = scale_stime((__force u64)stime, stime = scale_stime((__force u64)stime,
(__force u64)rtime, (__force u64)total); (__force u64)rtime, (__force u64)total);
utime = rtime - stime; utime = rtime - stime;
} else {
stime = rtime;
utime = 0;
} }
/* /*