diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 16:26:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 16:26:41 +0900 |
| commit | d60cf53a30956e47919788b2ef49287786a959c9 (patch) | |
| tree | cb518d7cc4813f4b54a3fd5fcaad43e6d82be6a3 /init/calibrate.c | |
| parent | 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff) | |
| parent | 13c12a4e8ecdf3998cd2d89ade69f6f194819c95 (diff) | |
| download | kernel_samsung_aries-d60cf53a30956e47919788b2ef49287786a959c9.zip kernel_samsung_aries-d60cf53a30956e47919788b2ef49287786a959c9.tar.gz kernel_samsung_aries-d60cf53a30956e47919788b2ef49287786a959c9.tar.bz2 | |
Merge branch 'sh/st-integration' into sh/urgent
Diffstat (limited to 'init/calibrate.c')
| -rw-r--r-- | init/calibrate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/calibrate.c b/init/calibrate.c index 6eb48e5..24fe022 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 <= - (start_jiffies + 1 + DELAY_CALIBRATION_TICKS)) { + while (time_before_eq(jiffies, start_jiffies + 1 + + DELAY_CALIBRATION_TICKS)) { pre_end = end; read_current_timer(&end); } |