---

yaml --- r: 109476 b: refs/heads/master c: de014d6 h: refs/heads/master v: v3
git-mirror · Sep 4, 2008 · 0cc0ea2 · 0cc0ea2
1 parent 8c995d7
commit 0cc0ea2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce36394269ccd9d1d286d6192ba09fa6894365e9
+refs/heads/master: de014d617636d6a6bd5aef3b3d1f7f9a35669057
diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c
@@ -267,8 +267,7 @@ unsigned long native_calibrate_tsc(void)
 	 */
 	if (tsc_pit_min == ULONG_MAX) {
 		/* PIT gave no useful value */
-		printk(KERN_WARNING "TSC: PIT calibration failed due to "
-		       "SMI disturbance.\n");
+		printk(KERN_WARNING "TSC: Unable to calibrate against PIT\n");
 
 		/* We don't have an alternative source, disable TSC */
 		if (!hpet && !pm1 && !pm2) {