DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 62CD844BD5
Date: Fri, 30 Jun 2017 18:17:17 +0200
From: Stanislaw Gruszka <sgruszka@redhat.com>
To: mingo@kernel.org, fransklaver@gmail.com, hpa@zytor.com,
        fweisbec@gmail.com, torvalds@linux-foundation.org, riel@redhat.com,
        tglx@linutronix.de, wanpeng.li@hotmail.com,
        linux-kernel@vger.kernel.org, garsilva@embeddedor.com,
        peterz@infradead.org
Cc: linux-tip-commits@vger.kernel.org
Subject: Re: [tip:sched/core] sched/cputime: Refactor the cputime_adjust()
 code
Message-ID: <20170630161716.GA16132@redhat.com>
References: <20170629184128.GA5271@embeddedgus>
 <tip-72298e5c92c50edd8cb7cfda4519483ce65fa166@git.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <tip-72298e5c92c50edd8cb7cfda4519483ce65fa166@git.kernel.org>
User-Agent: Mutt/1.8.0 (2017-02-23)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 989
Lines: 34

On Fri, Jun 30, 2017 at 06:10:35AM -0700, tip-bot for Gustavo A. R. Silva wrote:
> diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
> index aea3135..67c70e2 100644
> --- a/kernel/sched/cputime.c
> +++ 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:
Since 'update' label is removed, I think above comment should be
corrected too. Eventually patch could just remove 'utime = rtime;'
line to shut up coverity.

Stanislaw