timekeeping: Create struct tk_read_base and use it in struct timekeeper

[sfrench/cifs-2.6.git] / arch / tile / kernel / time.c

diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index d22d5bfc1e4e3247332d46d6e21120c2982094c9..d8fbc289e680f4f89b3871b4f6f8f4dd0675244e 100644 (file)
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -261,7 +261,7 @@ void update_vsyscall_tz(void)
 void update_vsyscall(struct timekeeper *tk)
 {
        struct timespec *wtm = &tk->wall_to_monotonic;
-       struct clocksource *clock = tk->clock;
+       struct clocksource *clock = tk->tkr.clock;
 
        if (clock != &cycle_counter_cs)
                return;
@@ -269,13 +269,13 @@ void update_vsyscall(struct timekeeper *tk)
        /* Userspace gettimeofday will spin while this value is odd. */
        ++vdso_data->tb_update_count;
        smp_wmb();
-       vdso_data->xtime_tod_stamp = tk->cycle_last;
+       vdso_data->xtime_tod_stamp = tk->tkr.cycle_last;
        vdso_data->xtime_clock_sec = tk->xtime_sec;
-       vdso_data->xtime_clock_nsec = tk->xtime_nsec;
+       vdso_data->xtime_clock_nsec = tk->tkr.xtime_nsec;
        vdso_data->wtom_clock_sec = wtm->tv_sec;
        vdso_data->wtom_clock_nsec = wtm->tv_nsec;
-       vdso_data->mult = tk->mult;
-       vdso_data->shift = tk->shift;
+       vdso_data->mult = tk->tkr.mult;
+       vdso_data->shift = tk->tkr.shift;
        smp_wmb();
        ++vdso_data->tb_update_count;
 }