2018-08-10 02:36:48

by Dou Liyang

Subject: [PATCH] sched/core: Fix compiling warring in smp=n case

When compiling kernel with SMP disabled, the build warns with:

kernel/sched/core.c: In function ‘update_rq_clock_task’:
kernel/sched/core.c:139:17: warning: unused variable ‘irq_delta’ [-Wunused-variable]
s64 steal = 0, irq_delta = 0;

Fix this by revert the HAVE_SCHED_AVG_IRQ to

defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)

Fixes: 2e62c4743adc ("sched/fair: Remove #ifdefs from scale_rt_capacity()")
Signed-off-by: Dou Liyang <[email protected]>
---
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 delta)

rq->clock_task += 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

2018-08-10 07:38:32

by Vincent Guittot

Subject: Re: [PATCH] sched/core: Fix compiling warring in smp=n case

Hi Dou,

On Fri, 10 Aug 2018 at 04:35, Dou Liyang <[email protected]> wrote:
>
> When compiling kernel with SMP disabled, the build warns with:
>
> kernel/sched/core.c: In function ‘update_rq_clock_task’:
> kernel/sched/core.c:139:17: warning: unused variable ‘irq_delta’ [-Wunused-variable]
> s64 steal = 0, irq_delta = 0;
>
> Fix this by revert the HAVE_SCHED_AVG_IRQ to
>
> defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)
>
> Fixes: 2e62c4743adc ("sched/fair: Remove #ifdefs from scale_rt_capacity()")
> Signed-off-by: Dou Liyang <[email protected]>

Acked-by: Vincent Guitttot <[email protected]>

> ---
> 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 delta)
>
> rq->clock_task += 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
>
>
>

2018-09-13 09:56:56

by Dou Liyang

Subject: Re: [PATCH] sched/core: Fix compiling warring in smp=n case

At 08/10/2018 10:35 AM, Dou Liyang wrote:
> When compiling kernel with SMP disabled, the build warns with:
>
> kernel/sched/core.c: In function ‘update_rq_clock_task’:
> kernel/sched/core.c:139:17: warning: unused variable ‘irq_delta’ [-Wunused-variable]
> s64 steal = 0, irq_delta = 0;
>
> Fix this by revert the HAVE_SCHED_AVG_IRQ to
>
> defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)
>
> Fixes: 2e62c4743adc ("sched/fair: Remove #ifdefs from scale_rt_capacity()")

Hi,

 Miguel also found this warning. Can we pick it up now? ;-)

Thanks,
dou

2018-09-14 16:49:47

by Miguel Ojeda

Subject: Re: [PATCH] sched/core: Fix compiling warring in smp=n case

Hi,

On Thu, Sep 13, 2018 at 11:55 AM, Dou Liyang <[email protected]> wrote:
>
>
> At 08/10/2018 10:35 AM, Dou Liyang wrote:
>>
>> When compiling kernel with SMP disabled, the build warns with:
>>
>> kernel/sched/core.c: In function ‘update_rq_clock_task’:
>> kernel/sched/core.c:139:17: warning: unused variable ‘irq_delta’
>> [-Wunused-variable]
>> s64 steal = 0, irq_delta = 0;
>>
>> Fix this by revert the HAVE_SCHED_AVG_IRQ to
>>
>> defined(CONFIG_IRQ_TIME_ACCOUNTING) ||
>> defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)
>>
>> Fixes: 2e62c4743adc ("sched/fair: Remove #ifdefs from
>> scale_rt_capacity()")
>
>
> Hi,
>
> Miguel also found this warning. Can we pick it up now? ;-)

Also Zhong has just sent another patch for this.

Whenever this is picked up, feel free to add:

Acked-by: Miguel Ojeda <[email protected]>

Cheers,
Miguel