From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail1.ugh.no ([178.79.162.34]:52685 "EHLO mail1.ugh.no"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750699AbbJRS7C (ORCPT <rfc822;stable@vger.kernel.org>);
	Sun, 18 Oct 2015 14:59:02 -0400
Subject: Xen build error in 4.2.4-rc1 (sched/preempt: Fix cond_resched_lock()
 and cond_resched_softirq())
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-kernel@vger.kernel.org,
	Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
References: <20151018014729.976101177@linuxfoundation.org>
Cc: linux@roeck-us.net, stable@vger.kernel.org
From: Andre Tomt <andre@tomt.net>
Message-ID: <5623EBF0.5020405@tomt.net>
Date: Sun, 18 Oct 2015 20:58:56 +0200
MIME-Version: 1.0
In-Reply-To: <20151018014729.976101177@linuxfoundation.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

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.

I have not yet actually booted on any of these two variants.