x86: APIC/SMP: Downgrade the NMI watchdog for "noapic"
If configured to use the I/O APIC, the NMI watchdog is deemed to fail if the chip has been deactivated as a result of "noapic". Downgrade to the local APIC watchdog similarly to what is done for the UP case. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
d54db1ac9e
commit
d788bada2f
1 changed files with 3 additions and 1 deletions
|
@ -41,8 +41,10 @@ static inline void __init smpboot_setup_io_apic(void)
|
||||||
*/
|
*/
|
||||||
if (!skip_ioapic_setup && nr_ioapics)
|
if (!skip_ioapic_setup && nr_ioapics)
|
||||||
setup_IO_APIC();
|
setup_IO_APIC();
|
||||||
else
|
else {
|
||||||
nr_ioapics = 0;
|
nr_ioapics = 0;
|
||||||
|
localise_nmi_watchdog();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void smpboot_clear_io_apic(void)
|
static inline void smpboot_clear_io_apic(void)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue