---

yaml --- r: 62483 b: refs/heads/master c: 57c22f4 h: refs/heads/master i: 62481: 6407895 62479: bff50fd v: v3
git-mirror · Jul 22, 2007 · 9cb0098 · 9cb0098
1 parent eb253c8
commit 9cb0098
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f25f64ed5bd3c2932493681bdfdb483ea707da0a
+refs/heads/master: 57c22f49e4c7d27a03e109a317c30b12f1bae0b2
diff --git a/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c b/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c
@@ -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