diff options
author | John Stultz <john.stultz@linaro.org> | 2015-06-11 15:54:53 -0700 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-12 10:56:20 +0200 |
commit | d151832650ed98961a5650e73e85c349ad7839cb (patch) | |
tree | e21e07316e96f27af8c99cc57b59ff40725b004f /kernel/time/ntp.c | |
parent | 45bbfe64ea564a69e56ab6754006eee506224f46 (diff) | |
download | linux-d151832650ed98961a5650e73e85c349ad7839cb.tar.bz2 |
time: Move clock_was_set_seq update before updating shadow-timekeeper
It was reported that 868a3e915f7f5eba (hrtimer: Make offset
update smarter) was causing timer problems after suspend/resume.
The problem with that change is the modification to
clock_was_set_seq in timekeeping_update is done prior to
mirroring the time state to the shadow-timekeeper. Thus the
next time we do update_wall_time() the updated sequence is
overwritten by whats in the shadow copy.
This patch moves the shadow-timekeeper mirroring to the end
of the function, after all updates have been made, so all data
is kept in sync.
(This patch also affects the update_fast_timekeeper calls which
were also problematically done prior to the mirroring).
Reported-and-tested-by: Jeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1434063297-28657-2-git-send-email-john.stultz@linaro.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/ntp.c')
0 files changed, 0 insertions, 0 deletions