[PATCH] sched/core: include asm/paravirt.h

[PATCH] sched/core: include asm/paravirt.h

[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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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(+)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index e2687118a878..c98f2fd8c0d3 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.9.0

Re: [PATCH] sched/core: include asm/paravirt.h

[Arnd Bergmann]

On Fri, Feb 17, 2017 at 3:43 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---

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

    Arnd

>  kernel/sched/core.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index e2687118a878..c98f2fd8c0d3 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.9.0
>

Re: [PATCH] sched/core: include asm/paravirt.h

[Ingo Molnar]

* Arnd Bergmann <arnd@arndb.de> wrote:

> On Fri, Feb 17, 2017 at 3:43 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> > 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")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > ---
> 
> 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

Re: [PATCH] sched/core: include asm/paravirt.h

[Arnd Bergmann]

On Fri, Feb 24, 2017 at 9:31 AM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * Arnd Bergmann <arnd@arndb.de> wrote:
>
>> On Fri, Feb 17, 2017 at 3:43 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>> > 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")
>> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> > ---
>>
>> 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

Re: [PATCH] sched/core: include asm/paravirt.h

[Ingo Molnar]

* Arnd Bergmann <arnd@arndb.de> wrote:

> On Fri, Feb 24, 2017 at 9:31 AM, Ingo Molnar <mingo@kernel.org> wrote:
> >
> > * Arnd Bergmann <arnd@arndb.de> wrote:
> >
> >> On Fri, Feb 17, 2017 at 3:43 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> >> > 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")
> >> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >> > ---
> >>
> >> 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.

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

Thanks,

	Ingo