From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755142AbbHCRI4 (ORCPT ); Mon, 3 Aug 2015 13:08:56 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40449 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755121AbbHCRIy (ORCPT ); Mon, 3 Aug 2015 13:08:54 -0400 Date: Mon, 3 Aug 2015 10:08:00 -0700 From: tip-bot for Konstantin Khlebnikov Message-ID: Cc: efault@gmx.de, david.vrabel@citrix.com, linux-kernel@vger.kernel.org, hpa@zytor.com, boris.ostrovsky@oracle.com, paulus@samba.org, agraf@suse.de, mingo@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, khlebnikov@yandex-team.ru, peterz@infradead.org Reply-To: boris.ostrovsky@oracle.com, hpa@zytor.com, linux-kernel@vger.kernel.org, david.vrabel@citrix.com, efault@gmx.de, peterz@infradead.org, khlebnikov@yandex-team.ru, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, agraf@suse.de, paulus@samba.org In-Reply-To: <20150715095203.12246.72922.stgit@buzz> References: <20150715095203.12246.72922.stgit@buzz> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/preempt, powerpc, kvm: Use need_resched() instead of should_resched() Git-Commit-ID: c56dadf39761a6157239cac39e3988998c994f98 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c56dadf39761a6157239cac39e3988998c994f98 Gitweb: http://git.kernel.org/tip/c56dadf39761a6157239cac39e3988998c994f98 Author: Konstantin Khlebnikov AuthorDate: Wed, 15 Jul 2015 12:52:03 +0300 Committer: Ingo Molnar CommitDate: Mon, 3 Aug 2015 12:21:24 +0200 sched/preempt, powerpc, kvm: Use need_resched() instead of should_resched() 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 Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Graf Cc: Boris Ostrovsky Cc: David Vrabel Cc: Linus Torvalds Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20150715095203.12246.72922.stgit@buzz Signed-off-by: Ingo Molnar --- arch/powerpc/kvm/book3s_hv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 68d067a..a9f753f 100644 --- 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_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);