---

yaml --- r: 80355 b: refs/heads/master c: df43510 h: refs/heads/master i: 80353: b498bb2 80351: efd00d8 v: v3
git-mirror · Jan 30, 2008 · 3dbbbc4 · 3dbbbc4
1 parent 2b8262f
commit 3dbbbc4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade1af77129dea6e335b525ed3be3b846bc1ec13
+refs/heads/master: df43510b18b8439465b4b58556f0495b5f5d771e
diff --git a/trunk/arch/x86/kernel/tsc_sync.c b/trunk/arch/x86/kernel/tsc_sync.c
@@ -67,12 +67,12 @@ static __cpuinit void check_tsc_warp(void)
 
 		/*
 		 * Be nice every now and then (and also check whether
-		 * measurement is done [we also insert a 100 million
+		 * measurement is done [we also insert a 10 million
 		 * loops safety exit, so we dont lock up in case the
 		 * TSC readout is totally broken]):
 		 */
 		if (unlikely(!(i & 7))) {
-			if (now > end || i > 100000000)
+			if (now > end || i > 10000000)
 				break;
 			cpu_relax();
 			touch_nmi_watchdog();