Commit c30bd099 authored Dec 06, 2012 by Dong Zhu Committed by John Stultz Mar 15, 2013

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>

parent 7c6baa30

kernel/time.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -138,14 +138,15 @@ int persistent_clock_is_local;
		*/
		static inline void warp_clock(void)
		{
		if (sys_tz.tz_minuteswest != 0) {
		struct timespec adjust;

		adjust = current_kernel_time();
		if (sys_tz.tz_minuteswest != 0)
		persistent_clock_is_local = 1;
		adjust = current_kernel_time();
		adjust.tv_sec += sys_tz.tz_minuteswest * 60;
		do_settimeofday(&adjust);
		}
		}

		/*
		* In case for some reason the CMOS clock has not already been running