Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1583336 > unrolled thread

[PATCH] sched/core: Fix build paravirt build on arm and arm64

Back to article view | Back to linux.kernel

Contents

  [PATCH] sched/core: Fix build paravirt build on arm and arm64 Mark Brown <broonie@kernel.org> - 2017-02-17 12:20 +0100
    [tip:sched/urgent] sched/core: Fix build paravirt build on arm and  arm64 tip-bot for Mark Brown <tipbot@zytor.com> - 2017-02-24 10:50 +0100

#1583336 — [PATCH] sched/core: Fix build paravirt build on arm and arm64

Commit 004172bdad64432 (sched/core: Remove unnecessary #include
headers) in current -next removed the inclusion of asm/paravirt.h which
is used to get declarations of paravirt_steal_rq_enabled and
paravirt_steal_clock.  It is implicitly included on but not on arm and
arm64 breaking the build if paravirtualization is used.  Since things
from that header are used directly fix the build by putting the direct
inclusion back.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 kernel/sched/core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index c7ded3311ec4..6ea1925ac5c0 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -23,6 +23,9 @@
 
 #include <asm/switch_to.h>
 #include <asm/tlb.h>
+#ifdef CONFIG_PARAVIRT
+#include <asm/paravirt.h>
+#endif
 
 #include "sched.h"
 #include "../workqueue_internal.h"
-- 
2.11.0

[toc] | [next] | [standalone]

#1587473 — [tip:sched/urgent] sched/core: Fix build paravirt build on arm and arm64

Commit-ID:  d31c710a3f3ea69b017002a109a1e2a1750054f5
Gitweb:     http://git.kernel.org/tip/d31c710a3f3ea69b017002a109a1e2a1750054f5
Author:     Mark Brown <broonie@kernel.org>
AuthorDate: Fri, 17 Feb 2017 11:06:07 +0000
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 24 Feb 2017 09:30:54 +0100

sched/core: Fix build paravirt build on arm and arm64

Commit:

  004172bdad64432: ("sched/core: Remove unnecessary #include headers")

... in current -next removed the inclusion of asm/paravirt.h which
is used to get declarations of paravirt_steal_rq_enabled and
paravirt_steal_clock.

It is implicitly included on but not on arm and arm64 breaking the build
if paravirtualization is used.  Since things from that header are used
directly fix the build by putting the direct inclusion back.

Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170217110607.31264-1-broonie@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/sched/core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index e01bd80..b692d6c 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -23,6 +23,9 @@
 
 #include <asm/switch_to.h>
 #include <asm/tlb.h>
+#ifdef CONFIG_PARAVIRT
+#include <asm/paravirt.h>
+#endif
 
 #include "sched.h"
 #include "../workqueue_internal.h"

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web