* [PATCH] sched/core: Fix compiling warring in smp=n case
@ 2018-08-10 2:35 Dou Liyang
2018-08-10 7:12 ` Vincent Guittot
2018-09-13 9:55 ` Dou Liyang
0 siblings, 2 replies; 4+ messages in thread
From: Dou Liyang @ 2018-08-10 2:35 UTC (permalink / raw)
To: linux-kernel, x86; +Cc: tglx, mingo, hpa, peterz, vincent.guittot, Dou Liyang
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 <douly.fnst@cn.fujitsu.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] sched/core: Fix compiling warring in smp=n case
2018-08-10 2:35 [PATCH] sched/core: Fix compiling warring in smp=n case Dou Liyang
@ 2018-08-10 7:12 ` Vincent Guittot
2018-09-13 9:55 ` Dou Liyang
1 sibling, 0 replies; 4+ messages in thread
From: Vincent Guittot @ 2018-08-10 7:12 UTC (permalink / raw)
To: douly.fnst
Cc: linux-kernel, x86, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
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 ‘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 <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 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
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] sched/core: Fix compiling warring in smp=n case
2018-08-10 2:35 [PATCH] sched/core: Fix compiling warring in smp=n case Dou Liyang
2018-08-10 7:12 ` Vincent Guittot
@ 2018-09-13 9:55 ` Dou Liyang
2018-09-14 16:48 ` Miguel Ojeda
1 sibling, 1 reply; 4+ messages in thread
From: Dou Liyang @ 2018-09-13 9:55 UTC (permalink / raw)
To: linux-kernel, x86; +Cc: tglx, mingo, hpa, peterz, vincent.guittot, Dou Liyang
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] sched/core: Fix compiling warring in smp=n case
2018-09-13 9:55 ` Dou Liyang
@ 2018-09-14 16:48 ` Miguel Ojeda
0 siblings, 0 replies; 4+ messages in thread
From: Miguel Ojeda @ 2018-09-14 16:48 UTC (permalink / raw)
To: Dou Liyang
Cc: linux-kernel, maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT),
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Vincent Guittot, Dou Liyang
Hi,
On Thu, Sep 13, 2018 at 11:55 AM, Dou Liyang <dou_liyang@163.com> 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 <miguel.ojeda.sandonis@gmail.com>
Cheers,
Miguel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-14 16:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-10 2:35 [PATCH] sched/core: Fix compiling warring in smp=n case Dou Liyang
2018-08-10 7:12 ` Vincent Guittot
2018-09-13 9:55 ` Dou Liyang
2018-09-14 16:48 ` Miguel Ojeda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).