Skip to contentSkip to conversation

sched/core: include asm/paravirt.h

PATCH In review Arnd Bergmann 2 participants 5 messages Feb 17, 2017 – Feb 24, 2017 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched/core: include asm/paravirt.h

One of the headers that got removed was needed after all, depending on the configuration:

kernel/sched/core.c: In function 'update_rq_clock_task':
kernel/sched/core.c:198:50: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function); did you mean 'arch_local_irq_enable'?

This restores the include.

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

---
The breakage was pretty obvious, so I assume others are reporting this as well. Please just ignore my patch if this is already fixed in -tip.

---
 kernel/sched/core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/sched/core.c +3 -0
index e2687118a878..c98f2fd8c0d3 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.9.0
#1 lore raw
Quoted 11 lines · Arnd Bergmann

One of the headers that got removed was needed after all, depending on the configuration:

kernel/sched/core.c: In function 'update_rq_clock_task':
kernel/sched/core.c:198:50: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function); did you mean 'arch_local_irq_enable'?

This restores the include.

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

---

The broken patch has now made it into mainline, according to the output of the build bots.

Arnd

Quoted 20 lines
 kernel/sched/core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/sched/core.c +3 -1
index e2687118a878..c98f2fd8c0d3 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"
--

2.9.0

#2 lore raw
Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · Arnd Bergmann

One of the headers that got removed was needed after all, depending on the configuration:

kernel/sched/core.c: In function 'update_rq_clock_task':
kernel/sched/core.c:198:50: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function); did you mean 'arch_local_irq_enable'?

Quoted 8 lines
Quoted 5 lines

This restores the include.

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

---

The broken patch has now made it into mainline, according to the output of the build bots.

Oops, I totally mis-read the bug reports and assumed it was related to the sched.h splitup, which is in a separate branch. But this was a sched/core commit ...

I'll push the fix to Linus later today and sorry about that!

Thanks,

Ingo

#3 lore raw
Quoted 16 lines · Ingo Molnar
Quoted 13 lines · Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

One of the headers that got removed was needed after all, depending on the configuration:

kernel/sched/core.c: In function 'update_rq_clock_task':
kernel/sched/core.c:198:50: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function); did you mean 'arch_local_irq_enable'?

This restores the include.

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

---

Quoted 7 lines
Quoted 2 lines

The broken patch has now made it into mainline, according to the output of the build bots.

Oops, I totally mis-read the bug reports and assumed it was related to the sched.h splitup, which is in a separate branch. But this was a sched/core commit ...

I'll push the fix to Linus later today and sorry about that!

It seems Mark Brown has sent the same fix, and Linus already merged it on Tuesday.

Arnd

#4 lore raw
Quoted 20 lines · Arnd Bergmann
Quoted 19 lines · Ingo Molnar
Quoted 15 lines · Arnd Bergmann
Quoted 11 lines · Arnd Bergmann

One of the headers that got removed was needed after all, depending on the configuration:

kernel/sched/core.c: In function 'update_rq_clock_task':
kernel/sched/core.c:198:50: error: 'paravirt_steal_rq_enabled' undeclared (first use in this function); did you mean 'arch_local_irq_enable'?

This restores the include.

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

---

The broken patch has now made it into mainline, according to the output of the build bots.

Quoted 7 lines
Quoted 4 lines

Oops, I totally mis-read the bug reports and assumed it was related to the sched.h splitup, which is in a separate branch. But this was a sched/core commit ...

I'll push the fix to Linus later today and sorry about that!

It seems Mark Brown has sent the same fix, and Linus already merged it on Tuesday.

Ok, cool - I dropped the sched/urgent version.

Thanks,

Ingo