summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-02-21 22:51:39 +0000
committerJohn Stultz <john.stultz@linaro.org>2013-04-04 13:18:31 -0700
commit7ec98e15aa049b7a2ca73485f31cf4f90c34e2dd (patch)
tree9cfe66164c13f1c2413fb2c8335971918e43d6c9 /kernel
parent14a3b6abe98c8f53a13522610c257accef7321df (diff)
downloadop-kernel-dev-7ec98e15aa049b7a2ca73485f31cf4f90c34e2dd.zip
op-kernel-dev-7ec98e15aa049b7a2ca73485f31cf4f90c34e2dd.tar.gz
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/timekeeping.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 4c276b2d..38ac782 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:
OpenPOWER on IntegriCloud