Re: 2.6.23-rc8-mm2: problems on HP nx6325

Thomas Gleixner
2007-09-27T15:49:36Z

On Thu, 2007-09-27 at 17:59 +0200, Rafael J. Wysocki wrote:
> > 2) CPU hotplug is busted (onlining of CPU1 kills the kernel), probably due to
> > the same issue that I'm having with the -hrt version of 2.6.23-rc8 (we're
> > debugging it right now)
>
> This one is fixed by the following patch:
>
> ---
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> Fix CPU hotplug breakage on HP nx6325 and similar boxes caused by a reference
> to disable_apic_timer (labeled as __initdata) from the CPU initialization code.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

Doh, I knew I blew it.

Good catch, thanks,

tglx

> ---
> arch/x86_64/kernel/apic.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6.23-rc8-mm2/arch/x86_64/kernel/apic.c
> ===================================================================
> --- linux-2.6.23-rc8-mm2.orig/arch/x86_64/kernel/apic.c
> +++ linux-2.6.23-rc8-mm2/arch/x86_64/kernel/apic.c
> @@ -42,7 +42,7 @@
>
> int apic_verbosity;
> static int apic_calibrate_pmtmr __initdata;
> -int disable_apic_timer __initdata;
> +int disable_apic_timer __cpuinitdata;
>
> /* Local APIC timer works in C2? */
> int local_apic_timer_c2_ok;