timekeeping: Create struct tk_read_base and use it in struct timekeeper

The members of the new struct are the required ones for the new NMI
safe accessor to clcok monotonic. In order to reuse the existing
timekeeping code and to make the update of the fast NMI safe
timekeepers a simple memcpy use the struct for the timekeeper as well
and convert all users.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 97950f392613..4cef607f3711 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -214,26 +214,26 @@ void update_vsyscall(struct timekeeper *tk)
 {
         u64 nsecps;
 
-        if (tk->clock != &clocksource_tod)
+        if (tk->tkr.clock != &clocksource_tod)
                 return;
 
         /* Make userspace gettimeofday spin until we're done. */
         ++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 =
                 tk->xtime_sec + tk->wall_to_monotonic.tv_sec;
-        vdso_data->wtom_clock_nsec = tk->xtime_nsec +
-                + ((u64) tk->wall_to_monotonic.tv_nsec << tk->shift);
-        nsecps = (u64) NSEC_PER_SEC << tk->shift;
+        vdso_data->wtom_clock_nsec = tk->tkr.xtime_nsec +
+                + ((u64) tk->wall_to_monotonic.tv_nsec << tk->tkr.shift);
+        nsecps = (u64) NSEC_PER_SEC << tk->tkr.shift;
         while (vdso_data->wtom_clock_nsec >= nsecps) {
                 vdso_data->wtom_clock_nsec -= nsecps;
                 vdso_data->wtom_clock_sec++;
         }
-        vdso_data->tk_mult = tk->mult;
-        vdso_data->tk_shift = tk->shift;
+        vdso_data->tk_mult = tk->tkr.mult;
+        vdso_data->tk_shift = tk->tkr.shift;
         smp_wmb();
         ++vdso_data->tb_update_count;
 }