time: Rename timekeeper::tkr to timekeeper::tkr_mono

In preparation of adding another tkr field, rename this one to
tkr_mono. Also rename tk_read_base::base_mono to tk_read_base::base,
since the structure is not specific to CLOCK_MONOTONIC and the mono
name got added to the tk_read_base instance.

Lots of trivial churn.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150319093400.344679419@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 6c273cd815bb..170ddd2018b3 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -215,20 +215,20 @@ void update_vsyscall(struct timekeeper *tk)
 {
         u64 nsecps;
 
-        if (tk->tkr.clock != &clocksource_tod)
+        if (tk->tkr_mono.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->tkr.cycle_last;
+        vdso_data->xtime_tod_stamp = tk->tkr_mono.cycle_last;
         vdso_data->xtime_clock_sec = tk->xtime_sec;
-        vdso_data->xtime_clock_nsec = tk->tkr.xtime_nsec;
+        vdso_data->xtime_clock_nsec = tk->tkr_mono.xtime_nsec;
         vdso_data->wtom_clock_sec =
                 tk->xtime_sec + tk->wall_to_monotonic.tv_sec;
-        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;
+        vdso_data->wtom_clock_nsec = tk->tkr_mono.xtime_nsec +
+                + ((u64) tk->wall_to_monotonic.tv_nsec << tk->tkr_mono.shift);
+        nsecps = (u64) NSEC_PER_SEC << tk->tkr_mono.shift;
         while (vdso_data->wtom_clock_nsec >= nsecps) {
                 vdso_data->wtom_clock_nsec -= nsecps;
                 vdso_data->wtom_clock_sec++;
@@ -236,7 +236,7 @@ void update_vsyscall(struct timekeeper *tk)
 
         vdso_data->xtime_coarse_sec = tk->xtime_sec;
         vdso_data->xtime_coarse_nsec =
-                (long)(tk->tkr.xtime_nsec >> tk->tkr.shift);
+                (long)(tk->tkr_mono.xtime_nsec >> tk->tkr_mono.shift);
         vdso_data->wtom_coarse_sec =
                 vdso_data->xtime_coarse_sec + tk->wall_to_monotonic.tv_sec;
         vdso_data->wtom_coarse_nsec =
@@ -246,8 +246,8 @@ void update_vsyscall(struct timekeeper *tk)
                 vdso_data->wtom_coarse_sec++;
         }
 
-        vdso_data->tk_mult = tk->tkr.mult;
-        vdso_data->tk_shift = tk->tkr.shift;
+        vdso_data->tk_mult = tk->tkr_mono.mult;
+        vdso_data->tk_shift = tk->tkr_mono.shift;
         smp_wmb();
         ++vdso_data->tb_update_count;
 }