diff options
| author | Jim Cromie <jim.cromie@gmail.com> | 2012-03-14 23:28:56 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-03-23 19:49:21 -0400 |
| commit | 88b28adf6fcdd6d10a1cfc7765bb200d7366a265 (patch) | |
| tree | 2a5e792dbd6e3a8971e8c163dac7f6a85f52f101 /kernel/time | |
| parent | 335dd85895abeca1957d5eaa3013dfe8dc60c7d7 (diff) | |
kernel-time: fix s/then/than/ spelling errors
Use than for comparisons, like more than.
CC: John Stultz <john.stultz@linaro.org>
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/clocksource.c | 2 | ||||
| -rw-r--r-- | kernel/time/timekeeping.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index a45ca167ab24..c9583382141a 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
| @@ -500,7 +500,7 @@ static u32 clocksource_max_adjustment(struct clocksource *cs) | |||
| 500 | { | 500 | { |
| 501 | u64 ret; | 501 | u64 ret; |
| 502 | /* | 502 | /* |
| 503 | * We won't try to correct for more then 11% adjustments (110,000 ppm), | 503 | * We won't try to correct for more than 11% adjustments (110,000 ppm), |
| 504 | */ | 504 | */ |
| 505 | ret = (u64)cs->mult * 11; | 505 | ret = (u64)cs->mult * 11; |
| 506 | do_div(ret,100); | 506 | do_div(ret,100); |
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 16a175bed355..51b98568ba4d 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
| @@ -822,7 +822,7 @@ static void timekeeping_adjust(s64 offset) | |||
| 822 | int adj; | 822 | int adj; |
| 823 | 823 | ||
| 824 | /* | 824 | /* |
| 825 | * The point of this is to check if the error is greater then half | 825 | * The point of this is to check if the error is greater than half |
| 826 | * an interval. | 826 | * an interval. |
| 827 | * | 827 | * |
| 828 | * First we shift it down from NTP_SHIFT to clocksource->shifted nsecs. | 828 | * First we shift it down from NTP_SHIFT to clocksource->shifted nsecs. |
| @@ -830,7 +830,7 @@ static void timekeeping_adjust(s64 offset) | |||
| 830 | * Note we subtract one in the shift, so that error is really error*2. | 830 | * Note we subtract one in the shift, so that error is really error*2. |
| 831 | * This "saves" dividing(shifting) interval twice, but keeps the | 831 | * This "saves" dividing(shifting) interval twice, but keeps the |
| 832 | * (error > interval) comparison as still measuring if error is | 832 | * (error > interval) comparison as still measuring if error is |
| 833 | * larger then half an interval. | 833 | * larger than half an interval. |
| 834 | * | 834 | * |
| 835 | * Note: It does not "save" on aggravation when reading the code. | 835 | * Note: It does not "save" on aggravation when reading the code. |
| 836 | */ | 836 | */ |
| @@ -838,7 +838,7 @@ static void timekeeping_adjust(s64 offset) | |||
| 838 | if (error > interval) { | 838 | if (error > interval) { |
| 839 | /* | 839 | /* |
| 840 | * We now divide error by 4(via shift), which checks if | 840 | * We now divide error by 4(via shift), which checks if |
| 841 | * the error is greater then twice the interval. | 841 | * the error is greater than twice the interval. |
| 842 | * If it is greater, we need a bigadjust, if its smaller, | 842 | * If it is greater, we need a bigadjust, if its smaller, |
| 843 | * we can adjust by 1. | 843 | * we can adjust by 1. |
| 844 | */ | 844 | */ |
| @@ -949,7 +949,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift) | |||
| 949 | u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift; | 949 | u64 nsecps = (u64)NSEC_PER_SEC << timekeeper.shift; |
| 950 | u64 raw_nsecs; | 950 | u64 raw_nsecs; |
| 951 | 951 | ||
| 952 | /* If the offset is smaller then a shifted interval, do nothing */ | 952 | /* If the offset is smaller than a shifted interval, do nothing */ |
| 953 | if (offset < timekeeper.cycle_interval<<shift) | 953 | if (offset < timekeeper.cycle_interval<<shift) |
| 954 | return offset; | 954 | return offset; |
| 955 | 955 | ||
| @@ -1017,13 +1017,13 @@ static void update_wall_time(void) | |||
| 1017 | * With NO_HZ we may have to accumulate many cycle_intervals | 1017 | * With NO_HZ we may have to accumulate many cycle_intervals |
| 1018 | * (think "ticks") worth of time at once. To do this efficiently, | 1018 | * (think "ticks") worth of time at once. To do this efficiently, |
| 1019 | * we calculate the largest doubling multiple of cycle_intervals | 1019 | * we calculate the largest doubling multiple of cycle_intervals |
| 1020 | * that is smaller then the offset. We then accumulate that | 1020 | * that is smaller than the offset. We then accumulate that |
| 1021 | * chunk in one go, and then try to consume the next smaller | 1021 | * chunk in one go, and then try to consume the next smaller |
| 1022 | * doubled multiple. | 1022 | * doubled multiple. |
| 1023 | */ | 1023 | */ |
| 1024 | shift = ilog2(offset) - ilog2(timekeeper.cycle_interval); | 1024 | shift = ilog2(offset) - ilog2(timekeeper.cycle_interval); |
| 1025 | shift = max(0, shift); | 1025 | shift = max(0, shift); |
| 1026 | /* Bound shift to one less then what overflows tick_length */ | 1026 | /* Bound shift to one less than what overflows tick_length */ |
| 1027 | maxshift = (64 - (ilog2(ntp_tick_length())+1)) - 1; | 1027 | maxshift = (64 - (ilog2(ntp_tick_length())+1)) - 1; |
| 1028 | shift = min(shift, maxshift); | 1028 | shift = min(shift, maxshift); |
| 1029 | while (offset >= timekeeper.cycle_interval) { | 1029 | while (offset >= timekeeper.cycle_interval) { |
| @@ -1071,7 +1071,7 @@ static void update_wall_time(void) | |||
| 1071 | 1071 | ||
| 1072 | /* | 1072 | /* |
| 1073 | * Finally, make sure that after the rounding | 1073 | * Finally, make sure that after the rounding |
| 1074 | * xtime.tv_nsec isn't larger then NSEC_PER_SEC | 1074 | * xtime.tv_nsec isn't larger than NSEC_PER_SEC |
| 1075 | */ | 1075 | */ |
| 1076 | if (unlikely(timekeeper.xtime.tv_nsec >= NSEC_PER_SEC)) { | 1076 | if (unlikely(timekeeper.xtime.tv_nsec >= NSEC_PER_SEC)) { |
| 1077 | int leap; | 1077 | int leap; |
