]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
sched/preempt, powerpc, kvm: Use need_resched() instead of should_resched()
authorKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Wed, 15 Jul 2015 09:52:03 +0000 (12:52 +0300)
committerIngo Molnar <mingo@kernel.org>
Mon, 3 Aug 2015 10:21:24 +0000 (12:21 +0200)
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>
arch/powerpc/kvm/book3s_hv.c

index 68d067ad4222fd4ece16bd049bdadf6be57402d5..a9f753fb73a816143ec4a013d9424b2acf6dbee4 100644 (file)
@@ -2178,7 +2178,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
                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);