Skip to contentSkip to conversation

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

PATCH New Mark Brown 2 participants 2 messages Feb 17, 2017 – Feb 24, 2017 Scheduler

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 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.

---
 kernel/sched/core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/sched/core.c +3 -0
index c7ded3311ec4..6ea1925ac5c0 100644
@@ -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"
Signature · 1 line
2.11.0
#1 lore raw
sched/core: Fix build paravirt build on arm and arm64
Commit-ID:  d31c710a3f3ea69b017002a109a1e2a1750054f5
Gitweb:     http://git.kernel.org/tip/d31c710a3f3ea69b017002a109a1e2a1750054f5
Author:     Mark Brown <[email protected]>
AuthorDate: Fri, 17 Feb 2017 11:06:07 +0000
Committer:  Ingo Molnar <[email protected]>
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.

---
 kernel/sched/core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/sched/core.c +3 -0
index e01bd80..b692d6c 100644
@@ -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"