diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2007-07-21 11:10:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:08 -0400 |
| commit | e82f64e5bb0648a13630d752c35be1e7bd8bab96 (patch) | |
| tree | 2e681a5f2d7b18070dcb425f4004887d46afb843 /arch/i386/kernel/cpu | |
| parent | d9c6d69145ec696128961204f755a3b01edc2ff6 (diff) | |
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: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/kernel/cpu')
| -rw-r--r-- | arch/i386/kernel/cpu/perfctr-watchdog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c index 4d26d514c56f..30b5e48aa76b 100644 --- a/arch/i386/kernel/cpu/perfctr-watchdog.c +++ b/arch/i386/kernel/cpu/perfctr-watchdog.c | |||
| @@ -599,8 +599,8 @@ static struct wd_ops intel_arch_wd_ops = { | |||
| 599 | .setup = setup_intel_arch_watchdog, | 599 | .setup = setup_intel_arch_watchdog, |
| 600 | .rearm = p6_rearm, | 600 | .rearm = p6_rearm, |
| 601 | .stop = single_msr_stop_watchdog, | 601 | .stop = single_msr_stop_watchdog, |
| 602 | .perfctr = MSR_ARCH_PERFMON_PERFCTR0, | 602 | .perfctr = MSR_ARCH_PERFMON_PERFCTR1, |
| 603 | .evntsel = MSR_ARCH_PERFMON_EVENTSEL0, | 603 | .evntsel = MSR_ARCH_PERFMON_EVENTSEL1, |
| 604 | }; | 604 | }; |
| 605 | 605 | ||
| 606 | static void probe_nmi_watchdog(void) | 606 | static void probe_nmi_watchdog(void) |