From patchwork Thu Oct  8 14:54:54 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Mike Galbraith <efault@gmx.de>
X-Patchwork-Id: 52521
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n98F0Eci009612
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Thu, 8 Oct 2009 15:00:15 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932486AbZJHOzo (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Thu, 8 Oct 2009 10:55:44 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932478AbZJHOzo
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Thu, 8 Oct 2009 10:55:44 -0400
Received: from mail.gmx.net ([213.165.64.20]:52346 "HELO mail.gmx.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP
	id S932435AbZJHOzn (ORCPT <rfc822;linux-wireless@vger.kernel.org>);
	Thu, 8 Oct 2009 10:55:43 -0400
Received: (qmail invoked by alias); 08 Oct 2009 14:54:55 -0000
Received: from p4FE19D89.dip0.t-ipconnect.de (EHLO [192.168.178.27])
	[79.225.157.137]
	by mail.gmx.net (mp069) with SMTP; 08 Oct 2009 16:54:55 +0200
X-Authenticated: #14349625
X-Provags-ID: V01U2FsdGVkX19lOIIpanll+EsPHbjJ4YK7Gzx+TpPss6pvNt3rt7
	z35qnC4ayW+1V1
Subject: Re: [.32-rc3] scheduler: iwlagn consistently high in "waiting for
	CPU"
From: Mike Galbraith <efault@gmx.de>
To: Arjan van de Ven <arjan@infradead.org>
Cc: Frans Pop <elendil@planet.nl>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Ingo Molnar <mingo@elte.hu>, Peter Zijlstra <peterz@infradead.org>,
	linux-wireless@vger.kernel.org
In-Reply-To: <1255011186.7294.1.camel@marge.simson.net>
References: <200910051500.55875.elendil@planet.nl>
	<200910061749.02805.elendil@planet.nl>
	<200910071910.53907.elendil@planet.nl>
	<200910072034.57511.elendil@planet.nl>
	<1254974743.7797.21.camel@marge.simson.net>
	<20091008064041.67219b13@infradead.org>
	<1255011186.7294.1.camel@marge.simson.net>
Date: Thu, 08 Oct 2009 16:54:54 +0200
Message-Id: <1255013694.7309.7.camel@marge.simson.net>
Mime-Version: 1.0
X-Mailer: Evolution 2.24.1.1 
X-Y-GMX-Trusted: 0
X-FuHaFi: 0.55
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


Index: linux-2.6/kernel/sched_fair.c
===================================================================
--- linux-2.6.orig/kernel/sched_fair.c
+++ linux-2.6/kernel/sched_fair.c
@@ -495,8 +495,10 @@ static void update_curr(struct cfs_rq *c
 	u64 now = rq_of(cfs_rq)->clock;
 	unsigned long delta_exec;
 
-	if (unlikely(!curr))
+	if (unlikely(!curr)) {
+		update_rq_clock(rq_of(cfs_rq));
 		return;
+	}
 
 	/*
 	 * Get the amount of time the current task was running