lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i386: Handle P6s without performance counters in nmi watchdog

Browse Source 
I got an oops while booting a 32bit kernel on KVM because it doesn't
implement performance counters used by the NMI watchdog. Handle this
case.

Cc: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andi Kleen
2007-07-22 11:12:39 +02:00
committed by Linus Torvalds
parent f25f64ed5b
commit 57c22f49e4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/i386/kernel/cpu/perfctr-watchdog.c
View File

@@ -346,7 +346,9 @@ static int setup_p6_watchdog(unsigned nmi_hz)
perfctr_msr = MSR_P6_PERFCTR0; perfctr_msr = MSR_P6_PERFCTR0;
evntsel_msr = MSR_P6_EVNTSEL0; evntsel_msr = MSR_P6_EVNTSEL0;
wrmsrl(perfctr_msr, 0UL); /* KVM doesn't implement this MSR */
if (wrmsr_safe(perfctr_msr, 0, 0) < 0)
return 0;
evntsel = P6_EVNTSEL_INT evntsel = P6_EVNTSEL_INT
| P6_EVNTSEL_OS | P6_EVNTSEL_OS