Merge git://www.linux-watchdog.org/linux-watchdog

[linux-2.6-block.git] / arch / x86 / kernel / vsyscall_gtod.c

diff --git a/arch/x86/kernel/vsyscall_gtod.c b/arch/x86/kernel/vsyscall_gtod.c
index 9531fbb123ba2223257f48dd724b59a45289389c..c7d791f32b98e4f8598684306f086c6193ff6e93 100644 (file)
--- a/arch/x86/kernel/vsyscall_gtod.c
+++ b/arch/x86/kernel/vsyscall_gtod.c
@@ -31,29 +31,30 @@ void update_vsyscall(struct timekeeper *tk)
        gtod_write_begin(vdata);
 
        /* copy vsyscall data */
-       vdata->vclock_mode      = tk->clock->archdata.vclock_mode;
-       vdata->cycle_last       = tk->clock->cycle_last;
-       vdata->mask             = tk->clock->mask;
-       vdata->mult             = tk->mult;
-       vdata->shift            = tk->shift;
+       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->wall_time_sec            = tk->xtime_sec;
-       vdata->wall_time_snsec          = tk->xtime_nsec;
+       vdata->wall_time_snsec          = tk->tkr.xtime_nsec;
 
        vdata->monotonic_time_sec       = tk->xtime_sec
                                        + tk->wall_to_monotonic.tv_sec;
-       vdata->monotonic_time_snsec     = tk->xtime_nsec
+       vdata->monotonic_time_snsec     = tk->tkr.xtime_nsec
                                        + ((u64)tk->wall_to_monotonic.tv_nsec
-                                               << tk->shift);
+                                               << tk->tkr.shift);
        while (vdata->monotonic_time_snsec >=
-                                       (((u64)NSEC_PER_SEC) << tk->shift)) {
+                                       (((u64)NSEC_PER_SEC) << tk->tkr.shift)) {
                vdata->monotonic_time_snsec -=
-                                       ((u64)NSEC_PER_SEC) << tk->shift;
+                                       ((u64)NSEC_PER_SEC) << tk->tkr.shift;
                vdata->monotonic_time_sec++;
        }
 
        vdata->wall_time_coarse_sec     = tk->xtime_sec;
-       vdata->wall_time_coarse_nsec    = (long)(tk->xtime_nsec >> tk->shift);
+       vdata->wall_time_coarse_nsec    = (long)(tk->tkr.xtime_nsec >>
+                                                tk->tkr.shift);
 
        vdata->monotonic_time_coarse_sec =
                vdata->wall_time_coarse_sec + tk->wall_to_monotonic.tv_sec;