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, 12 insertions, 12 deletions

diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index d412b0856c0a..00178ecf9aea 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -257,34 +257,34 @@ void update_vsyscall_tz(void)
 
 void update_vsyscall(struct timekeeper *tk)
 {
-        if (tk->tkr.clock != &cycle_counter_cs)
+        if (tk->tkr_mono.clock != &cycle_counter_cs)
                 return;
 
         write_seqcount_begin(&vdso_data->tb_seq);
 
-        vdso_data->cycle_last           = tk->tkr.cycle_last;
-        vdso_data->mask                 = tk->tkr.mask;
-        vdso_data->mult                 = tk->tkr.mult;
-        vdso_data->shift                = tk->tkr.shift;
+        vdso_data->cycle_last           = tk->tkr_mono.cycle_last;
+        vdso_data->mask                 = tk->tkr_mono.mask;
+        vdso_data->mult                 = tk->tkr_mono.mult;
+        vdso_data->shift                = tk->tkr_mono.shift;
 
         vdso_data->wall_time_sec        = tk->xtime_sec;
-        vdso_data->wall_time_snsec      = tk->tkr.xtime_nsec;
+        vdso_data->wall_time_snsec      = tk->tkr_mono.xtime_nsec;
 
         vdso_data->monotonic_time_sec   = tk->xtime_sec
                                         + tk->wall_to_monotonic.tv_sec;
-        vdso_data->monotonic_time_snsec = tk->tkr.xtime_nsec
+        vdso_data->monotonic_time_snsec = tk->tkr_mono.xtime_nsec
                                         + ((u64)tk->wall_to_monotonic.tv_nsec
-                                                << tk->tkr.shift);
+                                                << tk->tkr_mono.shift);
         while (vdso_data->monotonic_time_snsec >=
-                                        (((u64)NSEC_PER_SEC) << tk->tkr.shift)) {
+                                        (((u64)NSEC_PER_SEC) << tk->tkr_mono.shift)) {
                 vdso_data->monotonic_time_snsec -=
-                                        ((u64)NSEC_PER_SEC) << tk->tkr.shift;
+                                        ((u64)NSEC_PER_SEC) << tk->tkr_mono.shift;
                 vdso_data->monotonic_time_sec++;
         }
 
         vdso_data->wall_time_coarse_sec = tk->xtime_sec;
-        vdso_data->wall_time_coarse_nsec = (long)(tk->tkr.xtime_nsec >>
-                                                 tk->tkr.shift);
+        vdso_data->wall_time_coarse_nsec = (long)(tk->tkr_mono.xtime_nsec >>
+                                                 tk->tkr_mono.shift);
 
         vdso_data->monotonic_time_coarse_sec =
                 vdso_data->wall_time_coarse_sec + tk->wall_to_monotonic.tv_sec;