From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 18 Oct 2015 22:05:24 +0000 (-0700)
Subject: 4.2-stable patches
X-Git-Tag: v3.10.91~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56d81efa408ad01d6ff9864e962dbc60eab3b72a;p=thirdparty%2Fkernel%2Fstable-queue.git

4.2-stable patches

added patches:
	sched-preempt-xen-use-need_resched-instead-of-should_resched.patch
---

diff --git a/queue-4.2/sched-preempt-xen-use-need_resched-instead-of-should_resched.patch b/queue-4.2/sched-preempt-xen-use-need_resched-instead-of-should_resched.patch
new file mode 100644
index 00000000000..34c88f65174
--- /dev/null
+++ b/queue-4.2/sched-preempt-xen-use-need_resched-instead-of-should_resched.patch
@@ -0,0 +1,43 @@
+From 0fa2f5cb2b0ecd8d56baa51f35f09aab234eb0bf Mon Sep 17 00:00:00 2001
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Date: Wed, 15 Jul 2015 12:52:01 +0300
+Subject: sched/preempt, xen: Use need_resched() instead of should_resched()
+
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+
+commit 0fa2f5cb2b0ecd8d56baa51f35f09aab234eb0bf upstream.
+
+This code is used only when CONFIG_PREEMPT=n and only in non-atomic context:
+xen_in_preemptible_hcall is set only in privcmd_ioctl_hypercall().
+Thus preempt_count is zero and should_resched() is equal to need_resched().
+
+Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Cc: Alexander Graf <agraf@suse.de>
+Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Cc: David Vrabel <david.vrabel@citrix.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Mike Galbraith <efault@gmx.de>
+Cc: Paul Mackerras <paulus@samba.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Link: http://lkml.kernel.org/r/20150715095201.12246.49283.stgit@buzz
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Cc: Andre Tomt <andre@tomt.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/xen/preempt.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/xen/preempt.c
++++ b/drivers/xen/preempt.c
+@@ -31,7 +31,7 @@ EXPORT_SYMBOL_GPL(xen_in_preemptible_hca
+ asmlinkage __visible void xen_maybe_preempt_hcall(void)
+ {
+ 	if (unlikely(__this_cpu_read(xen_in_preemptible_hcall)
+-		     && should_resched())) {
++		     && need_resched())) {
+ 		/*
+ 		 * Clear flag as we may be rescheduled on a different
+ 		 * cpu.
diff --git a/queue-4.2/series b/queue-4.2/series
index df6cb3295e7..ab5c350ebcf 100644
--- a/queue-4.2/series
+++ b/queue-4.2/series
@@ -256,3 +256,4 @@ mm-slab-fix-unexpected-index-mapping-result-of-kmalloc_size-index_node-1.patch
 blk-mq-avoid-setting-hctx-tags-cpumask-before-allocation.patch
 sched-preempt-fix-cond_resched_lock-and-cond_resched_softirq.patch
 3w-9xxx-don-t-unmap-bounce-buffered-commands.patch
+sched-preempt-xen-use-need_resched-instead-of-should_resched.patch