* [PATCH] sched/core: include asm/paravirt.h
@ 2017-02-17 14:43 Arnd Bergmann
2017-02-21 9:29 ` Arnd Bergmann
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2017-02-17 14:43 UTC (permalink / raw)
To: Ingo Molnar, Peter Zijlstra; +Cc: Arnd Bergmann, Thomas Gleixner, linux-kernel
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] sched/core: include asm/paravirt.h
2017-02-17 14:43 [PATCH] sched/core: include asm/paravirt.h Arnd Bergmann
@ 2017-02-21 9:29 ` Arnd Bergmann
2017-02-24 8:31 ` Ingo Molnar
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2017-02-21 9:29 UTC (permalink / raw)
To: Ingo Molnar, Peter Zijlstra
Cc: Arnd Bergmann, Thomas Gleixner, Linux Kernel Mailing List
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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sched/core: include asm/paravirt.h
2017-02-21 9:29 ` Arnd Bergmann
@ 2017-02-24 8:31 ` Ingo Molnar
2017-02-24 9:23 ` Arnd Bergmann
0 siblings, 1 reply; 5+ messages in thread
From: Ingo Molnar @ 2017-02-24 8:31 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Linux Kernel Mailing List
* 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sched/core: include asm/paravirt.h
2017-02-24 8:31 ` Ingo Molnar
@ 2017-02-24 9:23 ` Arnd Bergmann
2017-02-24 11:13 ` Ingo Molnar
0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2017-02-24 9:23 UTC (permalink / raw)
To: Ingo Molnar
Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Linux Kernel Mailing List
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sched/core: include asm/paravirt.h
2017-02-24 9:23 ` Arnd Bergmann
@ 2017-02-24 11:13 ` Ingo Molnar
0 siblings, 0 replies; 5+ messages in thread
From: Ingo Molnar @ 2017-02-24 11:13 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Linux Kernel Mailing List
* 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-02-24 11:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-17 14:43 [PATCH] sched/core: include asm/paravirt.h Arnd Bergmann
2017-02-21 9:29 ` Arnd Bergmann
2017-02-24 8:31 ` Ingo Molnar
2017-02-24 9:23 ` Arnd Bergmann
2017-02-24 11:13 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).