diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2014-07-16 21:05:13 +0000 |
|---|---|---|
| committer |   John Stultz <john.stultz@linaro.org> | 2014-07-23 15:01:52 -0700 |
| commit | 4a0e637738f06673725792d74eed67f8779b62c7 (patch) | |
| tree | a5943ca88cc98cf65d3d2fd22f6311699ed2222b /include/linux/timekeeper_internal.h | |
| parent | clocksource: Move cycle_last validation to core code (diff) | |
| download | wireguard-linux-4a0e637738f06673725792d74eed67f8779b62c7.tar.xz wireguard-linux-4a0e637738f06673725792d74eed67f8779b62c7.zip | |
clocksource: Get rid of cycle_last
cycle_last was added to the clocksource to support the TSC
validation. We moved that to the core code, so we can get rid of the
extra copy.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux/timekeeper_internal.h')
| -rw-r--r-- | include/linux/timekeeper_internal.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h index 2e20275a7083..cb88096222c0 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h @@ -29,6 +29,8 @@ struct timekeeper { /* Current clocksource used for timekeeping. */ struct clocksource *clock; + /* Last cycle value */ + cycle_t cycle_last; /* NTP adjusted clock multiplier */ u32 mult; /* The shift value of the current clocksource. */ @@ -62,8 +64,6 @@ struct timekeeper { /* Number of clock cycles in one NTP interval. */ cycle_t cycle_interval; - /* Last cycle value (also stored in clock->cycle_last) */ - cycle_t cycle_last; /* Number of clock shifted nano seconds in one NTP interval. */ u64 xtime_interval; /* shifted nano seconds left over when rounding cycle_interval */ @@ -91,7 +91,8 @@ extern void update_vsyscall_tz(void); #elif defined(CONFIG_GENERIC_TIME_VSYSCALL_OLD) extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm, - struct clocksource *c, u32 mult); + struct clocksource *c, u32 mult, + cycles_t cycle_last); extern void update_vsyscall_tz(void); #else |