aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time.c4
-rw-r--r--kernel/time/clockevents.c2
-rw-r--r--kernel/time/timekeeping.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/kernel/time.c b/kernel/time.c
index 33af3e55570d..3b705ecc3fb7 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -267,7 +267,7 @@ EXPORT_SYMBOL(jiffies_to_usecs);
267 * 267 *
268 * This function should be only used for timestamps returned by 268 * This function should be only used for timestamps returned by
269 * current_kernel_time() or CURRENT_TIME, not with do_gettimeofday() because 269 * current_kernel_time() or CURRENT_TIME, not with do_gettimeofday() because
270 * it doesn't handle the better resolution of the later. 270 * it doesn't handle the better resolution of the latter.
271 */ 271 */
272struct timespec timespec_trunc(struct timespec t, unsigned gran) 272struct timespec timespec_trunc(struct timespec t, unsigned gran)
273{ 273{
@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(getnstimeofday);
315 * This algorithm was first published by Gauss (I think). 315 * This algorithm was first published by Gauss (I think).
316 * 316 *
317 * WARNING: this function will overflow on 2106-02-07 06:28:16 on 317 * WARNING: this function will overflow on 2106-02-07 06:28:16 on
318 * machines were long is 32-bit! (However, as time_t is signed, we 318 * machines where long is 32-bit! (However, as time_t is signed, we
319 * will already get problems at other places on 2038-01-19 03:14:08) 319 * will already get problems at other places on 2038-01-19 03:14:08)
320 */ 320 */
321unsigned long 321unsigned long
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 1d327f6db424..3d1e3e1a1971 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -133,7 +133,7 @@ static void clockevents_do_notify(unsigned long reason, void *dev)
133} 133}
134 134
135/* 135/*
136 * Called after a notify add to make devices availble which were 136 * Called after a notify add to make devices available which were
137 * released from the notifier call. 137 * released from the notifier call.
138 */ 138 */
139static void clockevents_notify_released(void) 139static void clockevents_notify_released(void)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 4f2637eed0f6..1af9fb050fe2 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -364,7 +364,7 @@ static __always_inline int clocksource_bigadjust(s64 error, s64 *interval,
364 * with losing too many ticks, otherwise we would overadjust and 364 * with losing too many ticks, otherwise we would overadjust and
365 * produce an even larger error. The smaller the adjustment the 365 * produce an even larger error. The smaller the adjustment the
366 * faster we try to adjust for it, as lost ticks can do less harm 366 * faster we try to adjust for it, as lost ticks can do less harm
367 * here. This is tuned so that an error of about 1 msec is adusted 367 * here. This is tuned so that an error of about 1 msec is adjusted
368 * within about 1 sec (or 2^20 nsec in 2^SHIFT_HZ ticks). 368 * within about 1 sec (or 2^20 nsec in 2^SHIFT_HZ ticks).
369 */ 369 */
370 error2 = clock->error >> (TICK_LENGTH_SHIFT + 22 - 2 * SHIFT_HZ); 370 error2 = clock->error >> (TICK_LENGTH_SHIFT + 22 - 2 * SHIFT_HZ);