Re: PCI MSI breaks when booting with nosmp

[Jesse Barnes <jbarnes@virtuousgeek.org>]

On Tuesday, April 22, 2008 6:27 am Jean Delvare wrote:
> Hi Jesse,
>
> Le lundi 21 avril 2008, Jesse Barnes a écrit :
> > This might be closer to a real fix.  Can you confirm that this works for
> > you Jean?
> >
> > Thanks,
> > Jesse
> >
> > diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> > index e6abe8a..7cdf930 100644
> > --- a/arch/x86/kernel/smpboot.c
> > +++ b/arch/x86/kernel/smpboot.c
> > @@ -1138,14 +1138,10 @@ static int __init smp_sanity_check(unsigned
> > max_cpus) "forcing use of dummy APIC emulation.\n");
> >  		smpboot_clear_io_apic();
> >  #ifdef CONFIG_X86_32
> > -		if (nmi_watchdog == NMI_LOCAL_APIC) {
> > -			printk(KERN_INFO "activating minimal APIC for"
> > -					 "NMI watchdog use.\n");
> > -			connect_bsp_APIC();
> > -			setup_local_APIC();
> > -			end_local_APIC_setup();
> > -		}
> > +		connect_bsp_APIC();
> >  #endif
> > +		setup_local_APIC();
> > +		end_local_APIC_setup();
> >  		return -1;
> >  	}
>
> What tree is this patch against? I have no arch/x86/kernel/smpboot.c
> in 2.6.25.

It was against the git tip of yesterday afternoon.

Jesse