forked from Minki/linux
i386: Handle P6s without performance counters in nmi watchdog
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:
parent
f25f64ed5b
commit
57c22f49e4
@ -346,7 +346,9 @@ static int setup_p6_watchdog(unsigned nmi_hz)
|
||||
perfctr_msr = MSR_P6_PERFCTR0;
|
||||
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
|
||||
| P6_EVNTSEL_OS
|
||||
|
Loading…
Reference in New Issue
Block a user