LKML Archive on lore.kernel.org
 help / Atom feed
* [PATCH] sched/core: Fix compiling warring in smp=n case
@ 2018-08-10  2:35 Dou Liyang
  2018-08-10  7:12 ` Vincent Guittot
  0 siblings, 1 reply; 2+ 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	[flat|nested] 2+ 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
  0 siblings, 0 replies; 2+ 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] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ 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

LKML Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
	git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
	git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
	git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
	git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
	git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
	git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
		linux-kernel@vger.kernel.org linux-kernel@archiver.kernel.org
	public-inbox-index lkml


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox