On Fri, Jun 30, 2017 at 4:00 PM, Rik van Riel <riel@xxxxxxxxxx> wrote: > On Fri, 2017-06-30 at 06:10 -0700, tip-bot for Gustavo A. R. Silva > wrote: > >> +++ b/kernel/sched/cputime.c >> @@ -615,19 +615,13 @@ static void cputime_adjust(struct task_cputime >> *curr, >> * userspace. Once a task gets some ticks, the monotonicy >> code at >> * 'update' will ensure things converge to the observed >> ratio. >> */ >> - if (stime == 0) { >> - utime = rtime; >> - goto update; >> + if (stime != 0) { >> + if (utime == 0) >> + stime = rtime; >> + else >> + stime = scale_stime(stime, rtime, stime + >> utime); >> } >> >> - if (utime == 0) { >> - stime = rtime; >> - goto update; >> - } >> - >> - stime = scale_stime(stime, rtime, stime + utime); >> - >> -update: > > Wait, what? > > This get rid of the utime = rtime assignment, when > stime == 0. That could be a correctness issue. The first time utime is used after that assignment, it is overwritten with rtime - stime. The utime = rtime assignment is then pointless. -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
![]() |