1 files changed, 3 insertions, 3 deletions
diff --git a/init/calibrate.c b/init/calibrate.c
index 6eb48e53d61..24fe022c55f 100644
--- a/init/calibrate.c
+++ b/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 <=
+                while (time_before_eq(jiffies, start_jiffies + 1 +
-                       (start_jiffies + 1 + DELAY_CALIBRATION_TICKS)) {
+                                               DELAY_CALIBRATION_TICKS)) {
                        pre_end = end;
                        read_current_timer(&end);
                }

diff --git a/init/calibrate.c b/init/calibrate.c index 6eb48e53d61..24fe022c55f 100644 --- a/init/calibrate.c +++ b/init/calibrate.c
@@ -66,7 +66,7 @@ static unsigned long __cpuinit calibrate_delay_direct(void)
66	pre_start = 0;	66	pre_start = 0;
67	read_current_timer(&start);	67	read_current_timer(&start);
68	start_jiffies = jiffies;	68	start_jiffies = jiffies;
69	while (jiffies <= (start_jiffies + 1)) {	69	while (time_before_eq(jiffies, start_jiffies + 1)) {
70	pre_start = start;	70	pre_start = start;
71	read_current_timer(&start);	71	read_current_timer(&start);
72	}	72	}
@@ -74,8 +74,8 @@ static unsigned long __cpuinit calibrate_delay_direct(void)
74		74
75	pre_end = 0;	75	pre_end = 0;
76	end = post_start;	76	end = post_start;
77	while (jiffies <=	77	while (time_before_eq(jiffies, start_jiffies + 1 +
78	(start_jiffies + 1 + DELAY_CALIBRATION_TICKS)) {	78	DELAY_CALIBRATION_TICKS)) {
79	pre_end = end;	79	pre_end = end;
80	read_current_timer(&end);	80	read_current_timer(&end);
81	}	81	}