diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2008-06-06 03:28:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:13:20 +0200 |
| commit | d788bada2f6c49673f85338ac4c0c642e5e52cff (patch) | |
| tree | fd523dbe0636c903c34b56167813a4551bb312d1 | |
| parent | d54db1ac9ecde9bcb8a561595b02c1d970d3a4d6 (diff) | |
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>
| -rw-r--r-- | include/asm-x86/mach-default/smpboot_hooks.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86/mach-default/smpboot_hooks.h b/include/asm-x86/mach-default/smpboot_hooks.h index 56d0e1fa025..b63c5218200 100644 --- a/include/asm-x86/mach-default/smpboot_hooks.h +++ b/include/asm-x86/mach-default/smpboot_hooks.h @@ -41,8 +41,10 @@ static inline void __init smpboot_setup_io_apic(void) */ if (!skip_ioapic_setup && nr_ioapics) setup_IO_APIC(); - else + else { nr_ioapics = 0; + localise_nmi_watchdog(); + } } static inline void smpboot_clear_io_apic(void) |