lguest rebroken in 2.6.22-rc3-mm1

[Matt Mackall <mpm@selenic.com>]

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.