aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorZhen Lei <thunder.leizhen@huawei.com>2015-08-25 02:42:53 -0400
committerThomas Gleixner <tglx@linutronix.de>2015-09-22 06:54:23 -0400
commit571af55a31d3652ac1f758f116835a76d0335661 (patch)
treeefcdfb688730c8748fa9910add630085cd36918c /kernel/time
parent1f93e4a96c9109378204c147b3eec0d0e8100fde (diff)
time: Fix spelling in comments
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Cc: Hanjun Guo <guohanjun@huawei.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tianhong Ding <dingtianhong@huawei.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Xinwei Hu <huxinwei@huawei.com> Cc: Xunlei Pang <pang.xunlei@linaro.org> Cc: Zefan Li <lizefan@huawei.com> Link: http://lkml.kernel.org/r/1440484973-13892-1-git-send-email-thunder.leizhen@huawei.com [ Fixed yet another typo in one of the sentences fixed. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/clocksource.c2
-rw-r--r--kernel/time/hrtimer.c2
-rw-r--r--kernel/time/timekeeping.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 841b72f720e8..174c594ff8ef 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -479,7 +479,7 @@ static u32 clocksource_max_adjustment(struct clocksource *cs)
479 * return half the number of nanoseconds the hardware counter can technically 479 * return half the number of nanoseconds the hardware counter can technically
480 * cover. This is done so that we can potentially detect problems caused by 480 * cover. This is done so that we can potentially detect problems caused by
481 * delayed timers or bad hardware, which might result in time intervals that 481 * delayed timers or bad hardware, which might result in time intervals that
482 * are larger then what the math used can handle without overflows. 482 * are larger than what the math used can handle without overflows.
483 */ 483 */
484u64 clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask, u64 *max_cyc) 484u64 clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask, u64 *max_cyc)
485{ 485{
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 457a373e2181..435b8850dd80 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -59,7 +59,7 @@
59/* 59/*
60 * The timer bases: 60 * The timer bases:
61 * 61 *
62 * There are more clockids then hrtimer bases. Thus, we index 62 * There are more clockids than hrtimer bases. Thus, we index
63 * into the timer bases by the hrtimer_base_type enum. When trying 63 * into the timer bases by the hrtimer_base_type enum. When trying
64 * to reach a base using a clockid, hrtimer_clockid_to_base() 64 * to reach a base using a clockid, hrtimer_clockid_to_base()
65 * is used to convert from clockid to the proper hrtimer_base_type. 65 * is used to convert from clockid to the proper hrtimer_base_type.
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 3739ac6aa473..125f16a29cf6 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1674,7 +1674,7 @@ static void timekeeping_adjust(struct timekeeper *tk, s64 offset)
1674/** 1674/**
1675 * accumulate_nsecs_to_secs - Accumulates nsecs into secs 1675 * accumulate_nsecs_to_secs - Accumulates nsecs into secs
1676 * 1676 *
1677 * Helper function that accumulates a the nsecs greater then a second 1677 * Helper function that accumulates the nsecs greater than a second
1678 * from the xtime_nsec field to the xtime_secs field. 1678 * from the xtime_nsec field to the xtime_secs field.
1679 * It also calls into the NTP code to handle leapsecond processing. 1679 * It also calls into the NTP code to handle leapsecond processing.
1680 * 1680 *
@@ -1726,7 +1726,7 @@ static cycle_t logarithmic_accumulation(struct timekeeper *tk, cycle_t offset,
1726 cycle_t interval = tk->cycle_interval << shift; 1726 cycle_t interval = tk->cycle_interval << shift;
1727 u64 raw_nsecs; 1727 u64 raw_nsecs;
1728 1728
1729 /* If the offset is smaller then a shifted interval, do nothing */ 1729 /* If the offset is smaller than a shifted interval, do nothing */
1730 if (offset < interval) 1730 if (offset < interval)
1731 return offset; 1731 return offset;
1732 1732