summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2007-07-22 11:12:41 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 20:03:38 +0200
commita284b0518d2fe27cdde19485c8fe077a128cd827 (patch)
treeee6b9923cf1122b3f08f3bfc4074a8cef36f0d8f /arch
parenti386: Use patchable lock prefix in set_64bit (diff)
downloadlinux-a284b0518d2fe27cdde19485c8fe077a128cd827.tar.xz
linux-a284b0518d2fe27cdde19485c8fe077a128cd827.zip
i386: Fix the K7 NMI watchdog checkbit
The performance counters on K7 are only 48 bits wide, so using bit 63 to check if the counter overflowed is wrong. Let's use bit 47 instead. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Cc: Don Zickus <dzickus@redhat.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/cpu/perfctr-watchdog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c
index 572900398def..4be488e73bee 100644
--- a/arch/i386/kernel/cpu/perfctr-watchdog.c
+++ b/arch/i386/kernel/cpu/perfctr-watchdog.c
@@ -325,7 +325,7 @@ static struct wd_ops k7_wd_ops = {
.stop = single_msr_stop_watchdog,
.perfctr = MSR_K7_PERFCTR0,
.evntsel = MSR_K7_EVNTSEL0,
- .checkbit = 1ULL<<63,
+ .checkbit = 1ULL<<47,
};
/* Intel Model 6 (PPro+,P2,P3,P-M,Core1) */