time: Ensure we normalize the timekeeper in tk_xtime_add
Andreas noticed problems with resume on specific hardware after commit1e75fa8b
(time: Condense timekeeper.xtime into xtime_sec) combined with commitb44d50dca
(time: Fix casting issue in tk_set_xtime and tk_xtime_add) After some digging I realized we aren't normalizing the timekeeper after the add. Add the missing normalize call. Reported-by: Andreas Schwab <schwab@linux-m68k.org> Tested-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: John Stultz <john.stultz@linaro.org> Cc: Prarit Bhargava <prarit@redhat.com> Cc: Ingo Molnar <mingo@kernel.org> Link: http://lkml.kernel.org/r/1345595449-34965-2-git-send-email-john.stultz@linaro.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
4e8b14526c
commit
784ffcbb96
|
@ -115,6 +115,7 @@ static void tk_xtime_add(struct timekeeper *tk, const struct timespec *ts)
|
|||
{
|
||||
tk->xtime_sec += ts->tv_sec;
|
||||
tk->xtime_nsec += (u64)ts->tv_nsec << tk->shift;
|
||||
tk_normalize_xtime(tk);
|
||||
}
|
||||
|
||||
static void tk_set_wall_to_mono(struct timekeeper *tk, struct timespec wtm)
|
||||
|
|
Loading…
Reference in a new issue