timekeeping: Delay update of clock->cycle_last

For calculating the new timekeeper values store the new cycle_last
value in the timekeeper and update the clock->cycle_last just when we
actually update the new values.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 4c276b2d022d..38ac782c0ef8 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1271,7 +1271,7 @@ static cycle_t logarithmic_accumulation(struct timekeeper *tk, cycle_t offset,
 
         /* Accumulate one shifted interval */
         offset -= interval;
-        tk->clock->cycle_last += interval;
+        tk->cycle_last += interval;
 
         tk->xtime_nsec += tk->xtime_interval << shift;
         accumulate_nsecs_to_secs(tk);
@@ -1386,6 +1386,8 @@ static void update_wall_time(void)
          */
         accumulate_nsecs_to_secs(tk);
 
+        /* Update clock->cycle_last with the new value */
+        clock->cycle_last = tk->cycle_last;
         timekeeping_update(tk, false);
 
 out: