Commit e82f64e5 authored by Björn Steinbrink's avatar Björn Steinbrink Committed by Linus Torvalds

i386: Reserve the right performance counter for the Intel PerfMon NMI watchdog

The Intel PerfMon NMI watchdog reserves the first performance counter,
but uses the second one. Make it correctly reserve the second one.
Signed-off-by: default avatarBjörn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d9c6d691
...@@ -599,8 +599,8 @@ static struct wd_ops intel_arch_wd_ops = { ...@@ -599,8 +599,8 @@ static struct wd_ops intel_arch_wd_ops = {
.setup = setup_intel_arch_watchdog, .setup = setup_intel_arch_watchdog,
.rearm = p6_rearm, .rearm = p6_rearm,
.stop = single_msr_stop_watchdog, .stop = single_msr_stop_watchdog,
.perfctr = MSR_ARCH_PERFMON_PERFCTR0, .perfctr = MSR_ARCH_PERFMON_PERFCTR1,
.evntsel = MSR_ARCH_PERFMON_EVENTSEL0, .evntsel = MSR_ARCH_PERFMON_EVENTSEL1,
}; };
static void probe_nmi_watchdog(void) static void probe_nmi_watchdog(void)
......
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