From patchwork Mon Jan 31 21:41:54 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Rik van Riel <riel@redhat.com>
X-Patchwork-Id: 521281
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0VLnb0C015076
	for <patchwork-kvm@patchwork.kernel.org>;
	Mon, 31 Jan 2011 21:49:42 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756418Ab1AaVtZ (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Mon, 31 Jan 2011 16:49:25 -0500
Received: from mx1.redhat.com ([209.132.183.28]:21053 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756559Ab1AaVsI (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 31 Jan 2011 16:48:08 -0500
Received: from int-mx02.intmail.prod.int.phx2.redhat.com
	(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0VLm0Fd013100
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Mon, 31 Jan 2011 16:48:00 -0500
Received: from annuminas.surriel.com (ovpn-113-70.phx2.redhat.com
	[10.3.113.70])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id p0VLlpTi031904; Mon, 31 Jan 2011 16:47:59 -0500
Date: Mon, 31 Jan 2011 16:41:54 -0500
From: Rik van Riel <riel@redhat.com>
To: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Avi Kiviti <avi@redhat.com>,
	Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Mike Galbraith <efault@gmx.de>, Chris Wright <chrisw@sous-sol.org>,
	"Nakajima, Jun" <jun.nakajima@intel.com>
Subject: [PATCH -v8 1/7] sched: check the right ->nr_running in
	yield_task_fair
Message-ID: <20110131164154.564ee7bd@annuminas.surriel.com>
In-Reply-To: <20110131164049.0ad68e72@annuminas.surriel.com>
References: <20110131164049.0ad68e72@annuminas.surriel.com>
Organization: Red Hat, Inc.
Mime-Version: 1.0
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Mon, 31 Jan 2011 21:49:43 +0000 (UTC)


diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index c62ebae..7b338ac 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1304,7 +1304,7 @@ static void yield_task_fair(struct rq *rq)
 	/*
 	 * Are we the only task in the tree?
 	 */
-	if (unlikely(cfs_rq->nr_running == 1))
+	if (unlikely(rq->nr_running == 1))
 		return;
 
 	clear_buddies(cfs_rq, se);