1 files changed, 8 insertions, 8 deletions

diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index 05af9a334893..fb86963859c7 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -16,16 +16,16 @@
  * @read:       Read function of @clock
  * @mask:       Bitmask for two's complement subtraction of non 64bit clocks
  * @cycle_last: @clock cycle value at last update
- * @mult:       NTP adjusted multiplier for scaled math conversion
+ * @mult:       (NTP adjusted) multiplier for scaled math conversion
  * @shift:      Shift value for scaled math conversion
  * @xtime_nsec: Shifted (fractional) nano seconds offset for readout
- * @base_mono:  ktime_t (nanoseconds) base time for readout
+ * @base:       ktime_t (nanoseconds) base time for readout
  *
  * This struct has size 56 byte on 64 bit. Together with a seqcount it
  * occupies a single 64byte cache line.
  *
  * The struct is separate from struct timekeeper as it is also used
- * for a fast NMI safe accessor to clock monotonic.
+ * for a fast NMI safe accessors.
  */
 struct tk_read_base {
         struct clocksource      *clock;
@@ -35,12 +35,13 @@ struct tk_read_base {
         u32                     mult;
         u32                     shift;
         u64                     xtime_nsec;
-        ktime_t                 base_mono;
+        ktime_t                 base;
 };
 
 /**
  * struct timekeeper - Structure holding internal timekeeping values.
- * @tkr:                The readout base structure
+ * @tkr_mono:           The readout base structure for CLOCK_MONOTONIC
+ * @tkr_raw:            The readout base structure for CLOCK_MONOTONIC_RAW
  * @xtime_sec:          Current CLOCK_REALTIME time in seconds
  * @ktime_sec:          Current CLOCK_MONOTONIC time in seconds
  * @wall_to_monotonic:  CLOCK_REALTIME to CLOCK_MONOTONIC offset
@@ -48,7 +49,6 @@ struct tk_read_base {
  * @offs_boot:          Offset clock monotonic -> clock boottime
  * @offs_tai:           Offset clock monotonic -> clock tai
  * @tai_offset:         The current UTC to TAI offset in seconds
- * @base_raw:           Monotonic raw base time in ktime_t format
  * @raw_time:           Monotonic raw base time in timespec64 format
  * @cycle_interval:     Number of clock cycles in one NTP interval
  * @xtime_interval:     Number of clock shifted nano seconds in one NTP
@@ -76,7 +76,8 @@ struct tk_read_base {
  * used instead.
  */
 struct timekeeper {
-        struct tk_read_base     tkr;
+        struct tk_read_base     tkr_mono;
+        struct tk_read_base     tkr_raw;
         u64                     xtime_sec;
         unsigned long           ktime_sec;
         struct timespec64       wall_to_monotonic;
@@ -84,7 +85,6 @@ struct timekeeper {
         ktime_t                 offs_boot;
         ktime_t                 offs_tai;
         s32                     tai_offset;
-        ktime_t                 base_raw;
         struct timespec64       raw_time;
 
         /* The following members are for timekeeping internal use */