1 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 4b99b1bdeb6c..26e7a62e9ab6 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1269,6 +1269,10 @@ int __init APIC_init_uniprocessor(void)
 
         setup_local_APIC();
 
+#ifdef CONFIG_X86_IO_APIC
+        if (!smp_found_config || skip_ioapic_setup || !nr_ioapics)
+#endif
+                localise_nmi_watchdog();
         end_local_APIC_setup();
 #ifdef CONFIG_X86_IO_APIC
         if (smp_found_config)