Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into...

[mirror_ubuntu-zesty-kernel.git] / include / linux / timekeeper_internal.h

diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index 97381997625b35069d05c5269f978973689c9f40..95640dcd1899c533fc696a3fa964bbd39b3e9f01 100644 (file)
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -90,8 +90,18 @@ struct timekeeper {
        u64                     xtime_interval;
        s64                     xtime_remainder;
        u32                     raw_interval;
+       /* The ntp_tick_length() value currently being used.
+        * This cached copy ensures we consistently apply the tick
+        * length for an entire tick, as ntp_tick_length may change
+        * mid-tick, and we don't want to apply that new value to
+        * the tick in progress.
+        */
+       u64                     ntp_tick;
+       /* Difference between accumulated time and NTP time in ntp
+        * shifted nano seconds. */
        s64                     ntp_error;
        u32                     ntp_error_shift;
+       u32                     ntp_err_mult;
 };
 
 #ifdef CONFIG_GENERIC_TIME_VSYSCALL
@@ -103,7 +113,7 @@ extern void update_vsyscall_tz(void);
 
 extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
                                struct clocksource *c, u32 mult,
-                               cycles_t cycle_last);
+                               cycle_t cycle_last);
 extern void update_vsyscall_tz(void);
 
 #else