From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 24 Oct 2015 13:19:20 +0000 (-0700)
Subject: 4.1-stable patches
X-Git-Tag: v3.14.56~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70770418a41de7ecb9cb09ba25bbb2942386a99f;p=thirdparty%2Fkernel%2Fstable-queue.git

4.1-stable patches

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

diff --git a/queue-4.1/sched-preempt-powerpc-kvm-use-need_resched-instead-of-should_resched.patch b/queue-4.1/sched-preempt-powerpc-kvm-use-need_resched-instead-of-should_resched.patch
new file mode 100644
index 00000000000..99eab634646
--- /dev/null
+++ b/queue-4.1/sched-preempt-powerpc-kvm-use-need_resched-instead-of-should_resched.patch
@@ -0,0 +1,42 @@
+From c56dadf39761a6157239cac39e3988998c994f98 Mon Sep 17 00:00:00 2001
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Date: Wed, 15 Jul 2015 12:52:03 +0300
+Subject: sched/preempt, powerpc, kvm: Use need_resched() instead of should_resched()
+
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+
+commit c56dadf39761a6157239cac39e3988998c994f98 upstream.
+
+Function should_resched() is equal to (!preempt_count() && need_resched()).
+In preemptive kernel preempt_count here is non-zero because of vc->lock.
+
+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/20150715095203.12246.72922.stgit@buzz
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/kvm/book3s_hv.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/kvm/book3s_hv.c
++++ b/arch/powerpc/kvm/book3s_hv.c
+@@ -2178,7 +2178,7 @@ static int kvmppc_run_vcpu(struct kvm_ru
+ 		vc->runner = vcpu;
+ 		if (n_ceded == vc->n_runnable) {
+ 			kvmppc_vcore_blocked(vc);
+-		} else if (should_resched()) {
++		} else if (need_resched()) {
+ 			vc->vcore_state = VCORE_PREEMPT;
+ 			/* Let something else run */
+ 			cond_resched_lock(&vc->lock);
diff --git a/queue-4.1/series b/queue-4.1/series
index 4fe3b28a396..5c724c20b55 100644
--- a/queue-4.1/series
+++ b/queue-4.1/series
@@ -45,3 +45,4 @@ locks-new-helpers-flock_lock_inode_wait-and-posix_lock_inode_wait.patch
 locks-inline-posix_lock_file_wait-and-flock_lock_file_wait.patch
 nfs4-have-do_vfs_lock-take-an-inode-pointer.patch
 sched-preempt-xen-use-need_resched-instead-of-should_resched.patch
+sched-preempt-powerpc-kvm-use-need_resched-instead-of-should_resched.patch