diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 15:27:14 -0500 |
| commit | 02fa9f0451ac639a687bfc145eefe58703ff220e (patch) | |
| tree | fe984acc78f22f6eb8fb98efaba8b1ac2f3ad8d9 /init/calibrate.c | |
| parent | cbc9438075ca9dee3f39a2e7310f81c304b40359 (diff) | |
| parent | 51c404b2c514930e98e81e0b9294f19892a4f871 (diff) | |
Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
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 6eb48e53d61c..24fe022c55f9 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 | } |