Re: Xen build error in 4.2.4-rc1 (sched/preempt: Fix cond_resched_lock() and cond_resched_softirq())

From: Greg Kroah-Hartman
Date: Sun Oct 18 2015 - 18:07:01 EST


On Sun, Oct 18, 2015 at 08:58:56PM +0200, Andre Tomt wrote:
> On 18. okt. 2015 03:55, Greg Kroah-Hartman wrote:
> >This is the start of the stable review cycle for the 4.2.4 release.
> >There are 258 patches in this series, all will be posted as a response
> >to this one. If anyone has any issues with these being applied, please
> >let me know.
>
> There is a new build error in this rc:
>
> > CC drivers/xen/preempt.o
> >In file included from include/uapi/linux/stddef.h:1:0,
> > from include/linux/stddef.h:4,
> > from ./include/uapi/linux/posix_types.h:4,
> > from include/uapi/linux/types.h:13,
> > from include/linux/types.h:5,
> > from include/uapi/linux/capability.h:16,
> > from include/linux/capability.h:15,
> > from include/linux/sched.h:15,
> > from drivers/xen/preempt.c:12:
> >drivers/xen/preempt.c: In function 'xen_maybe_preempt_hcall':
> >drivers/xen/preempt.c:34:11: error: too few arguments to function 'should_resched'
> > && should_resched())) {
> > ^
> >include/linux/compiler.h:166:42: note: in definition of macro 'unlikely'
> > # define unlikely(x) __builtin_expect(!!(x), 0)
> > ^
> >In file included from include/linux/preempt.h:64:0,
> > from include/linux/spinlock.h:50,
> > from include/linux/seqlock.h:35,
> > from include/linux/time.h:5,
> > from include/uapi/linux/timex.h:56,
> > from include/linux/timex.h:56,
> > from include/linux/sched.h:19,
> > from drivers/xen/preempt.c:12:
> >./arch/x86/include/asm/preempt.h:93:29: note: declared here
> > static __always_inline bool should_resched(int preempt_offset)
> > ^
> >scripts/Makefile.build:258: recipe for target 'drivers/xen/preempt.o' failed
>
> Caused by fe32d3cd5e8eb0f82e459763374aa80797023403
> "sched/preempt: Fix cond_resched_lock() and cond_resched_softirq()"
> Builds OK with it reverted.
>
> Alternatively, pulling in 0fa2f5cb2b0ecd8d56baa51f35f09aab234eb0bf
> "sched/preempt, xen: Use need_resched() instead of should_resched()"
> from linus master to fixes the build error as well.

Thanks, I've pulled in that patch now to the 4.2-stable tree.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/