Merge branch 'fortglx/4.13/time' of https://git.linaro.org/people/john.stultz/linux into timers/core

Merge time(keeping) updates from John Stultz:

  "Just a small set of changes, the biggest changes being the MONOTONIC_RAW
   handling cleanup, and a new kselftest from Miroslav. Also a a clear
   warning deprecating CONFIG_GENERIC_TIME_VSYSCALL_OLD, which affects ppc
   and ia64."

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index f7043ccca81c..0a0a53daf2a2 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -51,7 +51,7 @@ struct tk_read_base {
  * @clock_was_set_seq:  The sequence number of clock was set events
  * @cs_was_changed_seq: The sequence number of clocksource change events
  * @next_leap_ktime:    CLOCK_MONOTONIC time value of a pending leap-second
- * @raw_time:           Monotonic raw base time in timespec64 format
+ * @raw_sec:            CLOCK_MONOTONIC_RAW  time in seconds
  * @cycle_interval:     Number of clock cycles in one NTP interval
  * @xtime_interval:     Number of clock shifted nano seconds in one NTP
  *                      interval.
@@ -93,7 +93,7 @@ struct timekeeper {
         unsigned int            clock_was_set_seq;
         u8                      cs_was_changed_seq;
         ktime_t                 next_leap_ktime;
-        struct timespec64       raw_time;
+        u64                     raw_sec;
 
         /* The following members are for timekeeping internal use */
         u64                     cycle_interval;