openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

timekeeping: Avoid adjust kernel time once hwclock kept in UTC time 

If the Hardware Clock kept in local time,kernel will adjust the time
to be UTC time.But if Hardware Clock kept in UTC time,system will make
a dummy settimeofday call first (sys_tz.tz_minuteswest = 0) to make sure
the time is not shifted,so at this point I think maybe it is not necessary
to set the kernel time once the sys_tz.tz_minuteswest is zero.

Signed-off-by: Dong Zhu <bluezhudong@gmail.com>
[jstultz: Updated to merge with conflicting changes ]
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
Dong Zhu 2012-12-06 22:03:34 +08:00 committed by John Stultz
parent 7c6baa304b
commit c30bd09915
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/time.c
View File

@ -138,13 +138,14 @@ int persistent_clock_is_local;
*/ */
static inline void warp_clock(void) static inline void warp_clock(void)
{ {
struct timespec adjust; if (sys_tz.tz_minuteswest != 0) {
struct timespec adjust;
adjust = current_kernel_time();
if (sys_tz.tz_minuteswest != 0)
persistent_clock_is_local = 1; persistent_clock_is_local = 1;
adjust.tv_sec += sys_tz.tz_minuteswest * 60; adjust = current_kernel_time();
do_settimeofday(&adjust); adjust.tv_sec += sys_tz.tz_minuteswest * 60;
do_settimeofday(&adjust);
}
} }
/* /*