From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754217AbbHYHqh (ORCPT ); Tue, 25 Aug 2015 03:46:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38407 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbbHYHqf (ORCPT ); Tue, 25 Aug 2015 03:46:35 -0400 Date: Tue, 25 Aug 2015 00:45:32 -0700 From: tip-bot for Zhen Lei Message-ID: Cc: hpa@zytor.com, rafael.j.wysocki@intel.com, tglx@linutronix.de, mingo@kernel.org, thunder.leizhen@huawei.com, viresh.kumar@linaro.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, huxinwei@huawei.com, peterz@infradead.org, guohanjun@huawei.com, dingtianhong@huawei.com, lizefan@huawei.com, pang.xunlei@linaro.org, john.stultz@linaro.org Reply-To: tglx@linutronix.de, thunder.leizhen@huawei.com, mingo@kernel.org, hpa@zytor.com, rafael.j.wysocki@intel.com, huxinwei@huawei.com, torvalds@linux-foundation.org, guohanjun@huawei.com, peterz@infradead.org, viresh.kumar@linaro.org, linux-kernel@vger.kernel.org, lizefan@huawei.com, dingtianhong@huawei.com, pang.xunlei@linaro.org, john.stultz@linaro.org In-Reply-To: <1440484973-13892-1-git-send-email-thunder.leizhen@huawei.com> References: <1440484973-13892-1-git-send-email-thunder.leizhen@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] time: Fix spelling in comments Git-Commit-ID: 922ba733b7fbe6dfb300feaf16d4fa25382c2823 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 922ba733b7fbe6dfb300feaf16d4fa25382c2823 Gitweb: http://git.kernel.org/tip/922ba733b7fbe6dfb300feaf16d4fa25382c2823 Author: Zhen Lei AuthorDate: Tue, 25 Aug 2015 14:42:53 +0800 Committer: Ingo Molnar CommitDate: Tue, 25 Aug 2015 09:42:13 +0200 time: Fix spelling in comments Signed-off-by: Zhen Lei Cc: Hanjun Guo Cc: John Stultz Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Thomas Gleixner Cc: Tianhong Ding Cc: Viresh Kumar Cc: Xinwei Hu Cc: Xunlei Pang Cc: Zefan Li 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 --- 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;