Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20180810023523.23923-1-douly.fnst@cn.fujitsu.com>
In-Reply-To: <20180810023523.23923-1-douly.fnst@cn.fujitsu.com>
From:   Vincent Guittot <vincent.guittot@linaro.org>
Date:   Fri, 10 Aug 2018 09:12:59 +0200
Message-ID: <CAKfTPtD_O9aDG=r7f2nCXteHsjNwxdD2Nrthv1TwkPw0O8NYtQ@mail.gmail.com>
Subject: Re: [PATCH] sched/core: Fix compiling warring in smp=n case
To:     douly.fnst@cn.fujitsu.com
Cc:     linux-kernel <linux-kernel@vger.kernel.org>, x86@kernel.org,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Dou,

On Fri, 10 Aug 2018 at 04:35, Dou Liyang <douly.fnst@cn.fujitsu.com> wrote:
>
> When compiling kernel with SMP disabled, the build warns with:
>
> kernel/sched/core.c: In function =E2=80=98update_rq_clock_task=E2=80=99:
> kernel/sched/core.c:139:17: warning: unused variable =E2=80=98irq_delta=
=E2=80=99 [-Wunused-variable]
>   s64 steal =3D 0, irq_delta =3D 0;
>
> Fix this by revert the HAVE_SCHED_AVG_IRQ to
>
>   defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACC=
OUNTING)
>
> Fixes: 2e62c4743adc ("sched/fair: Remove #ifdefs from scale_rt_capacity()=
")
> Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>

Acked-by: Vincent Guitttot <vincent.guittot@linaro.org>

> ---
>  kernel/sched/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index c45de46fdf10..ef954d96c80c 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -177,7 +177,7 @@ static void update_rq_clock_task(struct rq *rq, s64 d=
elta)
>
>         rq->clock_task +=3D delta;
>
> -#ifdef HAVE_SCHED_AVG_IRQ
> +#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_=
ACCOUNTING)
>         if ((irq_delta + steal) && sched_feat(NONTASK_CAPACITY))
>                 update_irq_load_avg(rq, irq_delta + steal);
>  #endif
> --
> 2.14.3
>
>
>