Commit 7bc2551d authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Linus Torvalds

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

This 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.
parent f377a822
......@@ -462,8 +462,7 @@ void nmi_watchdog_tick (struct pt_regs * regs)
/* 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);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment