x86: fix PCI MSI breaks when booting with nosmp
set up sane APIC state even in the nosmp case. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Родитель
9752082560
Коммит
e90955c26d
|
@ -1149,14 +1149,10 @@ static int __init smp_sanity_check(unsigned max_cpus)
|
||||||
"forcing use of dummy APIC emulation.\n");
|
"forcing use of dummy APIC emulation.\n");
|
||||||
smpboot_clear_io_apic();
|
smpboot_clear_io_apic();
|
||||||
#ifdef CONFIG_X86_32
|
#ifdef CONFIG_X86_32
|
||||||
if (nmi_watchdog == NMI_LOCAL_APIC) {
|
connect_bsp_APIC();
|
||||||
printk(KERN_INFO "activating minimal APIC for"
|
|
||||||
"NMI watchdog use.\n");
|
|
||||||
connect_bsp_APIC();
|
|
||||||
setup_local_APIC();
|
|
||||||
end_local_APIC_setup();
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
setup_local_APIC();
|
||||||
|
end_local_APIC_setup();
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче