aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time/timekeeping.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/time/timekeeping.c')
-rw-r--r--kernel/time/timekeeping.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 2d6087c7cf98..a26429bc772a 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -371,7 +371,7 @@ static __always_inline int clocksource_bigadjust(s64 error, s64 *interval,
371 * here. This is tuned so that an error of about 1 msec is adjusted 371 * here. This is tuned so that an error of about 1 msec is adjusted
372 * within about 1 sec (or 2^20 nsec in 2^SHIFT_HZ ticks). 372 * within about 1 sec (or 2^20 nsec in 2^SHIFT_HZ ticks).
373 */ 373 */
374 error2 = clock->error >> (TICK_LENGTH_SHIFT + 22 - 2 * SHIFT_HZ); 374 error2 = clock->error >> (NTP_SCALE_SHIFT + 22 - 2 * SHIFT_HZ);
375 error2 = abs(error2); 375 error2 = abs(error2);
376 for (look_ahead = 0; error2 > 0; look_ahead++) 376 for (look_ahead = 0; error2 > 0; look_ahead++)
377 error2 >>= 2; 377 error2 >>= 2;
@@ -381,7 +381,7 @@ static __always_inline int clocksource_bigadjust(s64 error, s64 *interval,
381 * remove the single look ahead already included in the error. 381 * remove the single look ahead already included in the error.
382 */ 382 */
383 tick_error = current_tick_length() >> 383 tick_error = current_tick_length() >>
384 (TICK_LENGTH_SHIFT - clock->shift + 1); 384 (NTP_SCALE_SHIFT - clock->shift + 1);
385 tick_error -= clock->xtime_interval >> 1; 385 tick_error -= clock->xtime_interval >> 1;
386 error = ((error - tick_error) >> look_ahead) + tick_error; 386 error = ((error - tick_error) >> look_ahead) + tick_error;
387 387
@@ -412,7 +412,7 @@ static void clocksource_adjust(s64 offset)
412 s64 error, interval = clock->cycle_interval; 412 s64 error, interval = clock->cycle_interval;
413 int adj; 413 int adj;
414 414
415 error = clock->error >> (TICK_LENGTH_SHIFT - clock->shift - 1); 415 error = clock->error >> (NTP_SCALE_SHIFT - clock->shift - 1);
416 if (error > interval) { 416 if (error > interval) {
417 error >>= 2; 417 error >>= 2;
418 if (likely(error <= interval)) 418 if (likely(error <= interval))
@@ -434,7 +434,7 @@ static void clocksource_adjust(s64 offset)
434 clock->xtime_interval += interval; 434 clock->xtime_interval += interval;
435 clock->xtime_nsec -= offset; 435 clock->xtime_nsec -= offset;
436 clock->error -= (interval - offset) << 436 clock->error -= (interval - offset) <<
437 (TICK_LENGTH_SHIFT - clock->shift); 437 (NTP_SCALE_SHIFT - clock->shift);
438} 438}
439 439
440/** 440/**
@@ -474,7 +474,7 @@ void update_wall_time(void)
474 474
475 /* accumulate error between NTP and clock interval */ 475 /* accumulate error between NTP and clock interval */
476 clock->error += current_tick_length(); 476 clock->error += current_tick_length();
477 clock->error -= clock->xtime_interval << (TICK_LENGTH_SHIFT - clock->shift); 477 clock->error -= clock->xtime_interval << (NTP_SCALE_SHIFT - clock->shift);
478 } 478 }
479 479
480 /* correct the clock when NTP error is too big */ 480 /* correct the clock when NTP error is too big */