[PATCH 3/5] x86: APIC/UP: Remove redundant NMI watchdog downgrade

[Maciej W. Rozycki]

 For the UP case the NMI watchdog downgrade is done consistently in
APIC_init_uniprocessor() now.  Remove redundant code used only when 
BIOS-disabled local APIC is activated.

Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx>
---
patch-2.6.26-rc1-20080505-lapic-watchdog-bios-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-06-05 21:15:55.000000000 +0000
+++ linux-2.6.26-rc1-20080505/arch/x86/kernel/apic_32.c	2008-06-05 21:26:37.000000000 +0000
@@ -1154,9 +1154,6 @@ static int __init detect_init_APIC(void)
 	if (l & MSR_IA32_APICBASE_ENABLE)
 		mp_lapic_addr = l & MSR_IA32_APICBASE_BASE;
 
-	if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED)
-		nmi_watchdog = NMI_LOCAL_APIC;
-
 	printk(KERN_INFO "Found and enabled local APIC!\n");
 
 	apic_pm_activate();
--
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/