|
@@ -822,7 +822,7 @@ static void timekeeping_adjust(s64 offset)
|
|
int adj;
|
|
int adj;
|
|
|
|
|
|
/*
|
|
/*
|
|
- * The point of this is to check if the error is greater then half
|
|
|
|
|
|
+ * The point of this is to check if the error is greater than half
|
|
* an interval.
|
|
* an interval.
|
|
*
|
|
*
|
|
* First we shift it down from NTP_SHIFT to clocksource->shifted nsecs.
|
|
* First we shift it down from NTP_SHIFT to clocksource->shifted nsecs.
|
|
@@ -830,7 +830,7 @@ static void timekeeping_adjust(s64 offset)
|
|
* Note we subtract one in the shift, so that error is really error*2.
|
|
* Note we subtract one in the shift, so that error is really error*2.
|
|
* This "saves" dividing(shifting) interval twice, but keeps the
|
|
* This "saves" dividing(shifting) interval twice, but keeps the
|
|
* (error > interval) comparison as still measuring if error is
|
|
* (error > interval) comparison as still measuring if error is
|
|
- * larger then half an interval.
|
|
|
|
|
|
+ * larger than half an interval.
|
|
*
|
|
*
|
|
* Note: It does not "save" on aggravation when reading the code.
|
|
* Note: It does not "save" on aggravation when reading the code.
|
|
*/
|
|
*/
|
|
@@ -838,7 +838,7 @@ static void timekeeping_adjust(s64 offset)
|
|
if (error > interval) {
|
|
if (error > interval) {
|
|
/*
|
|
/*
|
|
* We now divide error by 4(via shift), which checks if
|
|
* We now divide error by 4(via shift), which checks if
|
|
- * the error is greater then twice the interval.
|
|
|
|
|
|
+ * the error is greater than twice the interval.
|
|
* If it is greater, we need a bigadjust, if its smaller,
|
|
* If it is greater, we need a bigadjust, if its smaller,
|
|
* we can adjust by 1.
|
|
* we can adjust by 1.
|
|
*/
|
|
*/
|
|
@@ -949,7 +949,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
|
|
u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift;
|
|
u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift;
|
|
u64 raw_nsecs;
|
|
u64 raw_nsecs;
|
|
|
|
|
|
- /* If the offset is smaller then a shifted interval, do nothing */
|
|
|
|
|
|
+ /* If the offset is smaller than a shifted interval, do nothing */
|
|
if (offset < timekeeper.cycle_interval<<shift)
|
|
if (offset < timekeeper.cycle_interval<<shift)
|
|
return offset;
|
|
return offset;
|
|
|
|
|
|
@@ -1017,13 +1017,13 @@ static void update_wall_time(void)
|
|
* With NO_HZ we may have to accumulate many cycle_intervals
|
|
* With NO_HZ we may have to accumulate many cycle_intervals
|
|
* (think "ticks") worth of time at once. To do this efficiently,
|
|
* (think "ticks") worth of time at once. To do this efficiently,
|
|
* we calculate the largest doubling multiple of cycle_intervals
|
|
* we calculate the largest doubling multiple of cycle_intervals
|
|
- * that is smaller then the offset. We then accumulate that
|
|
|
|
|
|
+ * that is smaller than the offset. We then accumulate that
|
|
* chunk in one go, and then try to consume the next smaller
|
|
* chunk in one go, and then try to consume the next smaller
|
|
* doubled multiple.
|
|
* doubled multiple.
|
|
*/
|
|
*/
|
|
shift = ilog2(offset) - ilog2(timekeeper.cycle_interval);
|
|
shift = ilog2(offset) - ilog2(timekeeper.cycle_interval);
|
|
shift = max(0, shift);
|
|
shift = max(0, shift);
|
|
- /* Bound shift to one less then what overflows tick_length */
|
|
|
|
|
|
+ /* Bound shift to one less than what overflows tick_length */
|
|
maxshift = (64 - (ilog2(ntp_tick_length())+1)) - 1;
|
|
maxshift = (64 - (ilog2(ntp_tick_length())+1)) - 1;
|
|
shift = min(shift, maxshift);
|
|
shift = min(shift, maxshift);
|
|
while (offset >= timekeeper.cycle_interval) {
|
|
while (offset >= timekeeper.cycle_interval) {
|
|
@@ -1071,7 +1071,7 @@ static void update_wall_time(void)
|
|
|
|
|
|
/*
|
|
/*
|
|
* Finally, make sure that after the rounding
|
|
* Finally, make sure that after the rounding
|
|
- * xtime.tv_nsec isn't larger then NSEC_PER_SEC
|
|
|
|
|
|
+ * xtime.tv_nsec isn't larger than NSEC_PER_SEC
|
|
*/
|
|
*/
|
|
if (unlikely(timekeeper.xtime.tv_nsec >= NSEC_PER_SEC)) {
|
|
if (unlikely(timekeeper.xtime.tv_nsec >= NSEC_PER_SEC)) {
|
|
int leap;
|
|
int leap;
|