diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 00:38:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 00:38:27 -0400 |
| commit | 49dc2b7173010792c6923930ffcee84b7094b7de (patch) | |
| tree | 439899abc82e7413b3bee6d52823d5350d7f2245 /kernel/time | |
| parent | d66435cc7da95964cb386674bd82ec12ca66320a (diff) | |
| parent | d00cd819d7dfb1a24d814457f47ff4d6c7be152c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
drivers/rtc: broken link fix
drm/i915 Fix typos in i915_gem_fence.c
Docs: fix missing word in REPORTING-BUGS
lib+mm: fix few spelling mistakes
MAINTAINERS: add git URL for APM driver
treewide: Fix typo in printk
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 9c629bbed572..479d25cd3d4f 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
| @@ -131,7 +131,7 @@ static void timekeeping_check_update(struct timekeeper *tk, cycle_t offset) | |||
| 131 | printk_deferred(" timekeeping: Your kernel is sick, but tries to cope by capping time updates\n"); | 131 | printk_deferred(" timekeeping: Your kernel is sick, but tries to cope by capping time updates\n"); |
| 132 | } else { | 132 | } else { |
| 133 | if (offset > (max_cycles >> 1)) { | 133 | if (offset > (max_cycles >> 1)) { |
| 134 | printk_deferred("INFO: timekeeping: Cycle offset (%lld) is larger than the the '%s' clock's 50%% safety margin (%lld)\n", | 134 | printk_deferred("INFO: timekeeping: Cycle offset (%lld) is larger than the '%s' clock's 50%% safety margin (%lld)\n", |
| 135 | offset, name, max_cycles >> 1); | 135 | offset, name, max_cycles >> 1); |
| 136 | printk_deferred(" timekeeping: Your kernel is still fine, but is feeling a bit nervous\n"); | 136 | printk_deferred(" timekeeping: Your kernel is still fine, but is feeling a bit nervous\n"); |
| 137 | } | 137 | } |