diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /init/calibrate.c | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
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 | } |