From 0c76c4ca2b01c3f0c0f8b756c76ad038b86fa070 Mon Sep 17 00:00:00 2001
From: Tim Deegan <Tim.Deegan@citrix.com>
Date: Thu, 10 Feb 2011 08:50:41 +0000
Subject: [PATCH] --- yaml --- r: 233059 b: refs/heads/master c:
 70a062286b9dfcbd24d2e11601aecfead5cf709a h: refs/heads/master i:   233057:
 a17bac3ec4b37c52699ec8e8496f606c56908945   233055:
 2fa7f2f932fd4f0208c12c6012aa03ee19cfe4c4 v: v3

---
 [refs]                 | 2 +-
 trunk/init/calibrate.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 42df44043749..7e9484b65a85 100644
--- 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
index 6eb48e53d61c..24fe022c55f9 100644
--- a/trunk/init/calibrate.c
+++ b/trunk/init/calibrate.c
@@ -66,7 +66,7 @@ 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);
 		}
@@ -74,8 +74,8 @@ static unsigned long __cpuinit calibrate_delay_direct(void)
 
 		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);
 		}