[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-922ba733b7fbe6dfb300feaf16d4fa25382c2823@git.kernel.org>
Date: Tue, 25 Aug 2015 00:45:32 -0700
From: tip-bot for Zhen Lei <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, rafael.j.wysocki@...el.com, tglx@...utronix.de,
mingo@...nel.org, thunder.leizhen@...wei.com,
viresh.kumar@...aro.org, linux-kernel@...r.kernel.org,
torvalds@...ux-foundation.org, huxinwei@...wei.com,
peterz@...radead.org, guohanjun@...wei.com,
dingtianhong@...wei.com, lizefan@...wei.com,
pang.xunlei@...aro.org, john.stultz@...aro.org
Subject: [tip:timers/core] time: Fix spelling in comments
Commit-ID: 922ba733b7fbe6dfb300feaf16d4fa25382c2823
Gitweb: http://git.kernel.org/tip/922ba733b7fbe6dfb300feaf16d4fa25382c2823
Author: Zhen Lei <thunder.leizhen@...wei.com>
AuthorDate: Tue, 25 Aug 2015 14:42:53 +0800
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 25 Aug 2015 09:42:13 +0200
time: Fix spelling in comments
Signed-off-by: Zhen Lei <thunder.leizhen@...wei.com>
Cc: Hanjun Guo <guohanjun@...wei.com>
Cc: John Stultz <john.stultz@...aro.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Tianhong Ding <dingtianhong@...wei.com>
Cc: Viresh Kumar <viresh.kumar@...aro.org>
Cc: Xinwei Hu <huxinwei@...wei.com>
Cc: Xunlei Pang <pang.xunlei@...aro.org>
Cc: Zefan Li <lizefan@...wei.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@...nel.org>
---
kernel/time/clocksource.c | 2 +-
kernel/time/hrtimer.c | 2 +-
kernel/time/timekeeping.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 841b72f..174c594 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -479,7 +479,7 @@ static u32 clocksource_max_adjustment(struct clocksource *cs)
* return half the number of nanoseconds the hardware counter can technically
* cover. This is done so that we can potentially detect problems caused by
* delayed timers or bad hardware, which might result in time intervals that
- * are larger then what the math used can handle without overflows.
+ * are larger than what the math used can handle without overflows.
*/
u64 clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask, u64 *max_cyc)
{
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 457a373..435b885 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -59,7 +59,7 @@
/*
* The timer bases:
*
- * There are more clockids then hrtimer bases. Thus, we index
+ * There are more clockids than hrtimer bases. Thus, we index
* into the timer bases by the hrtimer_base_type enum. When trying
* to reach a base using a clockid, hrtimer_clockid_to_base()
* 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 f6ee2e6..70cf144 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1674,7 +1674,7 @@ static void timekeeping_adjust(struct timekeeper *tk, s64 offset)
/**
* accumulate_nsecs_to_secs - Accumulates nsecs into secs
*
- * Helper function that accumulates a the nsecs greater then a second
+ * Helper function that accumulates the nsecs greater than a second
* from the xtime_nsec field to the xtime_secs field.
* It also calls into the NTP code to handle leapsecond processing.
*
@@ -1726,7 +1726,7 @@ static cycle_t logarithmic_accumulation(struct timekeeper *tk, cycle_t offset,
cycle_t interval = tk->cycle_interval << shift;
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 < interval)
return offset;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists