From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [Announce] 2.6.29.3-rt12
Date: Wed, 13 May 2009 12:19:07 +0200 (CEST)
Message-ID: <alpine.LFD.2.00.0905131217240.3561@localhost.localdomain>
References: <alpine.LFD.2.00.0902112332370.415@localhost.localdomain>  <alpine.LFD.2.00.0904031918090.12916@localhost.localdomain>  <alpine.LFD.2.00.0904081937191.21577@localhost.localdomain>  <alpine.LFD.2.00.0904092046440.21577@localhost.localdomain>
 <alpine.LFD.2.00.0904110003370.21577@localhost.localdomain>  <alpine.LFD.2.00.0904181204420.21577@localhost.localdomain>  <alpine.LFD.2.00.0904251500150.4529@localhost.localdomain>  <alpine.LFD.2.00.0904290036500.4529@localhost.localdomain>
 <alpine.LFD.2.00.0905012348200.3375@localhost.localdomain>  <alpine.LFD.2.00.0905130122250.3561@localhost.localdomain> <5a7b8b7b0905121716y646a2f68qad9181362caa22f6@mail.gmail.com>
Mime-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: LKML <linux-kernel@vger.kernel.org>,
	rt-users <linux-rt-users@vger.kernel.org>,
	Ingo Molnar <mingo@elte.hu>,
	Steven Rostedt <rostedt@goodmis.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Carsten Emde <ce@ceag.ch>,
	Clark Williams <williams@redhat.com>,
	Frank Rowand <frank.rowand@am.sony.com>,
	Robin Gareus <robin@gareus.org>,
	Gregory Haskins <ghaskins@novell.com>,
	Philippe Reynes <philippe.reynes@isismpp.fr>,
	Fernando Lopez-Lezcano <nando@ccrma.stanford.edu>,
	Will Schmidt <will_schmidt@vnet.ibm.com>,
	Darren Hart <dvhltc@us.ibm.com>, Jan Blunck <jblunck@suse.de>,
	Sven-Thorsten Dietrich <sdietrich@novell.com>
To: Hugo Vincent <hugo.vincent@gmail.com>
Return-path: <linux-rt-users-owner@vger.kernel.org>
Received: from www.tglx.de ([62.245.132.106]:49496 "EHLO www.tglx.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755168AbZEMKUH (ORCPT <rfc822;linux-rt-users@vger.kernel.org>);
	Wed, 13 May 2009 06:20:07 -0400
In-Reply-To: <5a7b8b7b0905121716y646a2f68qad9181362caa22f6@mail.gmail.com>
Sender: linux-rt-users-owner@vger.kernel.org
List-ID: <linux-rt-users.vger.kernel.org>

On Wed, 13 May 2009, Hugo Vincent wrote:
> This patch resulted in a broken build for me, until I did this:
> 
> --- a/patch-2.6.29.3-rt12
> +++ b/patch-2.6.29.3-rt12
> @@ -121754,7 +121754,7 @@ Index: linux-2.6-tip/kernel/sched.c
>   }
> 
>   /*
> -@@ -2801,6 +3177,15 @@ static void update_cpu_load(struct rq *t
> +@@ -2801,6 +3177,17 @@ static void update_cpu_load(struct rq *t
>   			new_load += scale-1;
>   		this_rq->cpu_load[i] = (old_load*(scale-1) + new_load) >> i;
>   	}
> @@ -121765,8 +121765,10 @@ Index: linux-2.6-tip/kernel/sched.c
>  +	this_rq->calc_load_update += LOAD_FREQ;
>  +	calc_load_account_active(this_rq);
>  +
> ++#ifdef CONFIG_SMP
>  +	if (this_rq->cpu == calc_load_cpu)
>  +		calc_global_load();
> ++#endif
>   }

Darn. the patch is halfways right. the #ifdef needs to be only around
the if() line. Otherwise your /proc/loadavg values will never be
updated. I'll push out -rt13 with the proper fix..

Thanks,

	tglx