diff options
Diffstat (limited to 'kernel/time/timekeeping.c')
-rw-r--r-- | kernel/time/timekeeping.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 237841378c03..0c6358186401 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -131,7 +131,7 @@ static inline s64 timekeeping_get_ns_raw(void) | |||
131 | /* calculate the delta since the last update_wall_time: */ | 131 | /* calculate the delta since the last update_wall_time: */ |
132 | cycle_delta = (cycle_now - clock->cycle_last) & clock->mask; | 132 | cycle_delta = (cycle_now - clock->cycle_last) & clock->mask; |
133 | 133 | ||
134 | /* return delta convert to nanoseconds using ntp adjusted mult. */ | 134 | /* return delta convert to nanoseconds. */ |
135 | return clocksource_cyc2ns(cycle_delta, clock->mult, clock->shift); | 135 | return clocksource_cyc2ns(cycle_delta, clock->mult, clock->shift); |
136 | } | 136 | } |
137 | 137 | ||
@@ -813,11 +813,11 @@ static void timekeeping_adjust(s64 offset) | |||
813 | * First we shift it down from NTP_SHIFT to clocksource->shifted nsecs. | 813 | * First we shift it down from NTP_SHIFT to clocksource->shifted nsecs. |
814 | * | 814 | * |
815 | * Note we subtract one in the shift, so that error is really error*2. | 815 | * Note we subtract one in the shift, so that error is really error*2. |
816 | * This "saves" dividing(shifting) intererval twice, but keeps the | 816 | * This "saves" dividing(shifting) interval twice, but keeps the |
817 | * (error > interval) comparision as still measuring if error is | 817 | * (error > interval) comparison as still measuring if error is |
818 | * larger then half an interval. | 818 | * larger then half an interval. |
819 | * | 819 | * |
820 | * Note: It does not "save" on aggrivation when reading the code. | 820 | * Note: It does not "save" on aggravation when reading the code. |
821 | */ | 821 | */ |
822 | error = timekeeper.ntp_error >> (timekeeper.ntp_error_shift - 1); | 822 | error = timekeeper.ntp_error >> (timekeeper.ntp_error_shift - 1); |
823 | if (error > interval) { | 823 | if (error > interval) { |
@@ -833,7 +833,7 @@ static void timekeeping_adjust(s64 offset) | |||
833 | * nanosecond, and store the amount rounded up into | 833 | * nanosecond, and store the amount rounded up into |
834 | * the error. This causes the likely below to be unlikely. | 834 | * the error. This causes the likely below to be unlikely. |
835 | * | 835 | * |
836 | * The properfix is to avoid rounding up by using | 836 | * The proper fix is to avoid rounding up by using |
837 | * the high precision timekeeper.xtime_nsec instead of | 837 | * the high precision timekeeper.xtime_nsec instead of |
838 | * xtime.tv_nsec everywhere. Fixing this will take some | 838 | * xtime.tv_nsec everywhere. Fixing this will take some |
839 | * time. | 839 | * time. |