Re: [PATCH] 2.6.10-rc2-mm4 panic on AMD64

[Andi Kleen <ak@suse.de>]

Sorry for the late answer, I was travelling.

On Mon, Dec 06, 2004 at 04:50:40PM -0800, Badari Pulavarty wrote:
> Ok !! Here is the patch to fix the problem. It works
> fine on my 4-way AMD64 box. 
> 
> Rafael, can you verify on yours ?
> 
> Problem is with "c - cpu_data" arthimetic. "c" could
> be "boot_cpu_data" or "cpu_data".
> 
> Andi, is this reasonable ?

Yes thanks.  Looks good (except for the whitespace in the if ;) 

Andrew, I assume you already merged it and pushed it to Linus.

-Andi (wearing a brown paper bag) 

[...]

> --- linux.org/arch/x86_64/kernel/setup.c	2004-12-06 17:47:46.000000000 -0800
> +++ linux/arch/x86_64/kernel/setup.c	2004-12-06 17:43:39.000000000 -0800
> @@ -947,7 +947,8 @@ void __init identify_cpu(struct cpuinfo_
>  	mcheck_init(c);
>  #endif
>  #ifdef CONFIG_NUMA
> -	numa_add_cpu(c - cpu_data);
> +	if ( c != &boot_cpu_data ) 
> +		numa_add_cpu(c - cpu_data);
>  #endif
>  }
>