Merge branch 'timers/core' into perf/timer, to apply dependent patch

An upcoming patch will depend on tai_ns() and NMI-safe ktime_get_raw_fast(),
so merge timers/core here in a separate topic branch until it's all cooked
and timers/core is merged upstream.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2 files changed, 19 insertions, 19 deletions

diff --git a/arch/x86/kernel/vsyscall_gtod.c b/arch/x86/kernel/vsyscall_gtod.c
index c7d791f32b98..51e330416995 100644
--- a/arch/x86/kernel/vsyscall_gtod.c
+++ b/arch/x86/kernel/vsyscall_gtod.c
@@ -31,30 +31,30 @@ void update_vsyscall(struct timekeeper *tk)
         gtod_write_begin(vdata);
 
         /* copy vsyscall data */
-        vdata->vclock_mode      = tk->tkr.clock->archdata.vclock_mode;
-        vdata->cycle_last       = tk->tkr.cycle_last;
-        vdata->mask             = tk->tkr.mask;
-        vdata->mult             = tk->tkr.mult;
-        vdata->shift            = tk->tkr.shift;
+        vdata->vclock_mode      = tk->tkr_mono.clock->archdata.vclock_mode;
+        vdata->cycle_last       = tk->tkr_mono.cycle_last;
+        vdata->mask             = tk->tkr_mono.mask;
+        vdata->mult             = tk->tkr_mono.mult;
+        vdata->shift            = tk->tkr_mono.shift;
 
         vdata->wall_time_sec            = tk->xtime_sec;
-        vdata->wall_time_snsec          = tk->tkr.xtime_nsec;
+        vdata->wall_time_snsec          = tk->tkr_mono.xtime_nsec;
 
         vdata->monotonic_time_sec       = tk->xtime_sec
                                         + tk->wall_to_monotonic.tv_sec;
-        vdata->monotonic_time_snsec     = tk->tkr.xtime_nsec
+        vdata->monotonic_time_snsec     = tk->tkr_mono.xtime_nsec
                                         + ((u64)tk->wall_to_monotonic.tv_nsec
-                                                << tk->tkr.shift);
+                                                << tk->tkr_mono.shift);
         while (vdata->monotonic_time_snsec >=
-                                        (((u64)NSEC_PER_SEC) << tk->tkr.shift)) {
+                                        (((u64)NSEC_PER_SEC) << tk->tkr_mono.shift)) {
                 vdata->monotonic_time_snsec -=
-                                        ((u64)NSEC_PER_SEC) << tk->tkr.shift;
+                                        ((u64)NSEC_PER_SEC) << tk->tkr_mono.shift;
                 vdata->monotonic_time_sec++;
         }
 
         vdata->wall_time_coarse_sec     = tk->xtime_sec;
-        vdata->wall_time_coarse_nsec    = (long)(tk->tkr.xtime_nsec >>
-                                                 tk->tkr.shift);
+        vdata->wall_time_coarse_nsec    = (long)(tk->tkr_mono.xtime_nsec >>
+                                                 tk->tkr_mono.shift);
 
         vdata->monotonic_time_coarse_sec =
                 vdata->wall_time_coarse_sec + tk->wall_to_monotonic.tv_sec;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 32bf19ef3115..0ee725f1896d 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1070,19 +1070,19 @@ static void update_pvclock_gtod(struct timekeeper *tk)
         struct pvclock_gtod_data *vdata = &pvclock_gtod_data;
         u64 boot_ns;
 
-        boot_ns = ktime_to_ns(ktime_add(tk->tkr.base_mono, tk->offs_boot));
+        boot_ns = ktime_to_ns(ktime_add(tk->tkr_mono.base, tk->offs_boot));
 
         write_seqcount_begin(&vdata->seq);
 
         /* copy pvclock gtod data */
-        vdata->clock.vclock_mode        = tk->tkr.clock->archdata.vclock_mode;
-        vdata->clock.cycle_last         = tk->tkr.cycle_last;
-        vdata->clock.mask               = tk->tkr.mask;
-        vdata->clock.mult               = tk->tkr.mult;
-        vdata->clock.shift              = tk->tkr.shift;
+        vdata->clock.vclock_mode        = tk->tkr_mono.clock->archdata.vclock_mode;
+        vdata->clock.cycle_last         = tk->tkr_mono.cycle_last;
+        vdata->clock.mask               = tk->tkr_mono.mask;
+        vdata->clock.mult               = tk->tkr_mono.mult;
+        vdata->clock.shift              = tk->tkr_mono.shift;
 
         vdata->boot_ns                  = boot_ns;
-        vdata->nsec_base                = tk->tkr.xtime_nsec;
+        vdata->nsec_base                = tk->tkr_mono.xtime_nsec;
 
         write_seqcount_end(&vdata->seq);
 }