Home » Mailing list archives » linux-kernel » 2008 » May » 21

[PATCH 6/8] x86: APIC/SMP: Downgrade the NMI watchdog for "nosmp"

Previous thread: [PATCH 5/8] x86: APIC/SMP: Correct the message for "nosmp" by Maciej W. Rozycki on Wednesday, May 21, 2008 - 2:09 pm. (1 message)

Next thread: [PATCH 7/8] x86: I/O APIC: Clean up the 8259A on a NMI watchdog failure by Maciej W. Rozycki on Wednesday, May 21, 2008 - 2:10 pm. (1 message)
[view original message]
From: Maciej W. Rozycki
Subject: [PATCH 6/8] x86: APIC/SMP: Downgrade the NMI watchdog for "nosmp"
Date: Wednesday, May 21, 2008 - 2:10 pm

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 "nosmp".  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>
---
patch-2.6.26-rc1-20080505-nosmp-watchdog-0
diff -up --recursive --new-file linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/smpboot.c linux-2.6.26-rc1-20080505/arch/x86/kernel/smpboot.c
--- linux-2.6.26-rc1-20080505.macro/arch/x86/kernel/smpboot.c	2008-05-21 06:24:25.000000000 +0000
+++ linux-2.6.26-rc1-20080505/arch/x86/kernel/smpboot.c	2008-05-21 06:24:25.000000000 +0000
@@ -1147,6 +1147,10 @@ static int __init smp_sanity_check(unsig
 	if (!max_cpus) {
 		printk(KERN_INFO "SMP mode deactivated.\n");
 		smpboot_clear_io_apic();
+
+		if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED)
+			nmi_watchdog = NMI_LOCAL_APIC;
+
 #ifdef CONFIG_X86_32
 		connect_bsp_APIC();
 #endif
--


[ message continues ]
Previous thread: [PATCH 5/8] x86: APIC/SMP: Correct the message for "nosmp" by Maciej W. Rozycki on Wednesday, May 21, 2008 - 2:09 pm. (1 message)

Next thread: [PATCH 7/8] x86: I/O APIC: Clean up the 8259A on a NMI watchdog failure by Maciej W. Rozycki on Wednesday, May 21, 2008 - 2:10 pm. (1 message)