[PATCH 2/5] x86: APIC/UP: Downgrade the NMI watchdog for no I/O APIC

[Maciej W. Rozycki]

 If configured to use the I/O APIC, the NMI watchdog is deemed to fail if
the chip will not be used in the UP configuration, because "noapic" has
been specified or the chip is simply not there.  Downgrade to the local
APIC watchdog to rectify.

Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx>
---
 The new #ifdef is ugly, I know.  A proper solution is to provide suitable
definitions of smp_found_config, etc. for !CONFIG_X86_IO_APIC in a header.  
Likewise the whole if () condition should be moved to a static inline
function.  Such clean-ups are beyond the scope of this change and can be 
done once the whole issue of the timer has been sorted out.

  Maciej

patch-2.6.26-rc1-20080505-lapic-watchdog-up-1
diff -up --recursive --new-file linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/apic_32.c linux-2.6.26-rc1-20080505/arch/x86/kernel/apic_32.c
--- linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/apic_32.c	2008-05-05 02:55:24.000000000 +0000
+++ linux-2.6.26-rc1-20080505/arch/x86/kernel/apic_32.c	2008-06-06 01:04:03.000000000 +0000
@@ -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)
diff -up --recursive --new-file linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/apic_64.c linux-2.6.26-rc1-20080505/arch/x86/kernel/apic_64.c
--- linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/apic_64.c	2008-05-05 02:55:24.000000000 +0000
+++ linux-2.6.26-rc1-20080505/arch/x86/kernel/apic_64.c	2008-06-06 01:05:35.000000000 +0000
@@ -954,6 +954,8 @@ int __init APIC_init_uniprocessor(void)
 	if (!skip_ioapic_setup && nr_ioapics)
 		enable_IO_APIC();
 
+	if (!smp_found_config || skip_ioapic_setup || !nr_ioapics)
+		localise_nmi_watchdog();
 	end_local_APIC_setup();
 
 	if (smp_found_config && !skip_ioapic_setup && nr_ioapics)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/