---

yaml --- r: 132422 b: refs/heads/master c: a6a80e1 h: refs/heads/master v: v3
git-mirror · Mar 17, 2009 · 95ee337 · 95ee337
1 parent e5b1922
commit 95ee337
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19695ec03d492f1eeb760727d3bd10c7d2f31c1d
+refs/heads/master: a6a80e1d8cf82b46a69f88e659da02749231eb36
diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c
@@ -315,6 +315,15 @@ static unsigned long quick_pit_calibrate(void)
 	outb(0xff, 0x42);
 	outb(0xff, 0x42);
 
+	/*
+	 * The PIT starts counting at the next edge, so we
+	 * need to delay for a microsecond. The easiest way
+	 * to do that is to just read back the 16-bit counter
+	 * once from the PIT.
+	 */
+	inb(0x42);
+	inb(0x42);
+
 	if (pit_expect_msb(0xff)) {
 		int i;
 		u64 t1, t2, delta;