---

yaml --- r: 110436 b: refs/heads/master c: 4156e9a h: refs/heads/master v: v3
git-mirror · Sep 4, 2008 · 5394408 · 5394408
1 parent 288156c
commit 5394408
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ac40ed0413ef4096720f966e11c7cdf259eee3f
+refs/heads/master: 4156e9a8ef5b521185f451213d33fa661f38512e
diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c
@@ -316,6 +316,12 @@ static unsigned long quick_pit_calibrate(void)
 		}
 		t2 = get_cycles();
 
+		/*
+		 * Make sure we can rely on the second TSC timestamp:
+		 */
+		if (!pit_expect_msb(--expect))
+			goto failed;
+
 		/*
 		 * Ok, if we get here, then we've seen the
 		 * MSB of the PIT decrement QUICK_PIT_ITERATIONS