diff options
author | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 18:29:39 (GMT) |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 18:29:39 (GMT) |
commit | 85ce230051c37dfb979385eb0244bf3655625ba6 (patch) | |
tree | 90abeab25f8c1ea4836b38279790b90f0c780ae3 /kernel/time/timekeeping.c | |
parent | 538ea4aa44737127ce2b5c8511c7349d2abdcf9c (diff) | |
parent | 209851649dc4f7900a6bfe1de5e2640ab2c7d931 (diff) | |
download | linux-85ce230051c37dfb979385eb0244bf3655625ba6.tar.xz |
Merge branch 'for-4.4/hotplug' into libnvdimm-for-next
Diffstat (limited to 'kernel/time/timekeeping.c')
-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 3739ac6..44d2cc0 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1251,7 +1251,7 @@ void __init timekeeping_init(void) set_normalized_timespec64(&tmp, -boot.tv_sec, -boot.tv_nsec); tk_set_wall_to_mono(tk, tmp); - timekeeping_update(tk, TK_MIRROR); + timekeeping_update(tk, TK_MIRROR | TK_CLOCK_WAS_SET); write_seqcount_end(&tk_core.seq); raw_spin_unlock_irqrestore(&timekeeper_lock, flags); |