[PATCH][2.6.6-rc2] clean up Pentium M quirk code in nmi.c

[Mikael Pettersson]

This patch simplifies the Pentium M quirk code in
nmi.c, and eliminates an unnecessary apic_read().

Local APIC accesses are not zero-cycle; let's not
inflict more damage than we must.

/Mikael

diff -ruN linux-2.6.6-rc2/arch/i386/kernel/nmi.c linux-2.6.6-rc2.nmi-fix/arch/i386/kernel/nmi.c
--- linux-2.6.6-rc2/arch/i386/kernel/nmi.c	2004-04-22 12:33:48.000000000 +0200
+++ linux-2.6.6-rc2.nmi-fix/arch/i386/kernel/nmi.c	2004-04-22 13:09:54.000000000 +0200
@@ -462,8 +462,7 @@
 			/* Only P6 based Pentium M need to re-unmask
 			 * the apic vector but it doesn't hurt
 			 * other P6 variant */
-			apic_write(APIC_LVTPC,
-				   apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED);
+			apic_write(APIC_LVTPC, APIC_DM_NMI);
 		}
 		wrmsr(nmi_perfctr_msr, -(cpu_khz/nmi_hz*1000), -1);
 	}
-
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/