summaryrefslogtreecommitdiff
path: root/kernel/time.c
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-02-23 00:33:29 +0400
committerJohn Stultz <john.stultz@linaro.org>2013-03-16 03:50:20 +0400
commit7859e404ae73fe4f38b8cfc1af19ea82f153084e (patch)
tree444947336576e1b01dd891273865ba8ec5b2ad5f /kernel/time.c
parentc30bd09915ea243603d7803d53de890c4a6f1474 (diff)
downloadlinux-7859e404ae73fe4f38b8cfc1af19ea82f153084e.tar.xz
timekeeping: Use inject_offset in warp_clock
When warping the clock (from a local time RTC), use timekeeping_inject_offset() to atomically add the offset. This avoids any minor time error caused by the delay between reading the time, and then setting the adjusted time. Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time.c')
-rw-r--r--kernel/time.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time.c b/kernel/time.c
index effac571589f..d3617dbd3dca 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -142,9 +142,9 @@ static inline void warp_clock(void)
struct timespec adjust;
persistent_clock_is_local = 1;
- adjust = current_kernel_time();
- adjust.tv_sec += sys_tz.tz_minuteswest * 60;
- do_settimeofday(&adjust);
+ adjust.tv_sec = sys_tz.tz_minuteswest * 60;
+ adjust.tv_nsec = 0;
+ timekeeping_inject_offset(&adjust);
}
}