From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1758849AbXFDRTy@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758849AbXFDRTy (ORCPT <rfc822;w@1wt.eu>);
	Mon, 4 Jun 2007 13:19:54 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756293AbXFDRTr
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 4 Jun 2007 13:19:47 -0400
Received: from waste.org ([66.93.16.53]:48975 "EHLO waste.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756676AbXFDRTq (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 4 Jun 2007 13:19:46 -0400
Date: Mon, 4 Jun 2007 12:19:33 -0500
From: Matt Mackall <mpm@selenic.com>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org
Subject: lguest rebroken in 2.6.22-rc3-mm1
Message-ID: <20070604171932.GE11115@waste.org>
References: <20070522223828.GV11115@waste.org> <1179876460.20705.157.camel@localhost.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1179876460.20705.157.camel@localhost.localdomain>
User-Agent: Mutt/1.5.13 (2006-08-11)
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, May 23, 2007 at 09:27:40AM +1000, Rusty Russell wrote:
> On Tue, 2007-05-22 at 17:38 -0500, Matt Mackall wrote:
> > [    0.120007] EIP is at resync_sc_freq+0x4b/0x56
> 
> Hi Matt,
> 
> 	Thanks for the report!  Andrew should have these two patches queued,
> but here they are again:
> 
> If you set tsc_disable (eg "notsc" on cmdline), sched-clock.c gives a
> divide by zero on boot.
> 
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
> 
> ---
>  arch/i386/kernel/sched-clock.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> ===================================================================
> --- a/arch/i386/kernel/sched-clock.c
> +++ b/arch/i386/kernel/sched-clock.c
> @@ -103,7 +103,7 @@ static void resync_sc_freq(struct sc_dat
>  static void resync_sc_freq(struct sc_data *sc, unsigned int newfreq)
>  {
>  	sc->sync_base = jiffies;
> -	if (!cpu_has_tsc) {
> +	if (!cpu_has_tsc || tsc_disable) {
>  		sc->unstable = 1;
>  		return;
>  	}

Looks like this one got lost in rc3-mm1.

-- 
Mathematics is the supreme nostalgia of our time.