---

yaml --- r: 233059 b: refs/heads/master c: 70a0622 h: refs/heads/master i: 233057: a17bac3 233055: 2fa7f2f v: v3
git-mirror · Feb 10, 2011 · 0c76c4c · 0c76c4c
1 parent 4bba6f8
commit 0c76c4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6148a47ac3872092d4bc4888838bec6dff16654d
+refs/heads/master: 70a062286b9dfcbd24d2e11601aecfead5cf709a
diff --git a/trunk/init/calibrate.c b/trunk/init/calibrate.c
@@ -66,16 +66,16 @@ static unsigned long __cpuinit calibrate_delay_direct(void)
 		pre_start = 0;
 		read_current_timer(&start);
 		start_jiffies = jiffies;
-		while (jiffies <= (start_jiffies + 1)) {
+		while (time_before_eq(jiffies, start_jiffies + 1)) {
 			pre_start = start;
 			read_current_timer(&start);
 		}
 		read_current_timer(&post_start);
 
 		pre_end = 0;
 		end = post_start;
-		while (jiffies <=
-		       (start_jiffies + 1 + DELAY_CALIBRATION_TICKS)) {
+		while (time_before_eq(jiffies, start_jiffies + 1 +
+					       DELAY_CALIBRATION_TICKS)) {
 			pre_end = end;
 			read_current_timer(&end);
 		}