diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-21 22:51:38 (GMT) |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-04-04 20:18:31 (GMT) |
commit | 14a3b6abe98c8f53a13522610c257accef7321df (patch) | |
tree | a14383c4c852d5d2268607443a61bfa437cd9bfd /kernel/time/timekeeping.c | |
parent | a076b2146fabb0894cae5e0189a8ba3f1502d737 (diff) | |
download | linux-fsl-qoriq-14a3b6abe98c8f53a13522610c257accef7321df.tar.xz |
timekeeping: Store cycle_last value in timekeeper struct as well
For implementing a shadow timekeeper and a split calculation/update
region we need to store the cycle_last value in the timekeeper and
update the value in the clocksource struct only in the update region.
Add the extra storage to the timekeeper.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time/timekeeping.c')
-rw-r--r-- | kernel/time/timekeeping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index f93f60c..4c276b2 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -101,7 +101,7 @@ static void tk_setup_internals(struct timekeeper *tk, struct clocksource *clock) old_clock = tk->clock; tk->clock = clock; - clock->cycle_last = clock->read(clock); + tk->cycle_last = clock->cycle_last = clock->read(clock); /* Do the ns -> cycle conversion first, using original mult */ tmp = NTP_INTERVAL_LENGTH; @@ -266,7 +266,7 @@ static void timekeeping_forward_now(struct timekeeper *tk) clock = tk->clock; cycle_now = clock->read(clock); cycle_delta = (cycle_now - clock->cycle_last) & clock->mask; - clock->cycle_last = cycle_now; + tk->cycle_last = clock->cycle_last = cycle_now; tk->xtime_nsec += cycle_delta * tk->mult; |