ktime: Get rid of the union

ktime is a union because the initial implementation stored the time in
scalar nanoseconds on 64 bit machine and in a endianess optimized timespec
variant for 32bit machines. The Y2038 cleanup removed the timespec variant
and switched everything to scalar nanoseconds. The union remained, but
become completely pointless.

Get rid of the union and just keep ktime_t as simple typedef of type s64.

The conversion was done with coccinelle and some manual mopping up.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index f4152a69277f..db087d7e106d 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -104,7 +104,7 @@ static void tk_set_wall_to_mono(struct timekeeper *tk, struct timespec64 wtm)
          */
         set_normalized_timespec64(&tmp, -tk->wall_to_monotonic.tv_sec,
                                         -tk->wall_to_monotonic.tv_nsec);
-        WARN_ON_ONCE(tk->offs_real.tv64 != timespec64_to_ktime(tmp).tv64);
+        WARN_ON_ONCE(tk->offs_real != timespec64_to_ktime(tmp));
         tk->wall_to_monotonic = wtm;
         set_normalized_timespec64(&tmp, -wtm.tv_sec, -wtm.tv_nsec);
         tk->offs_real = timespec64_to_ktime(tmp);
@@ -571,7 +571,7 @@ EXPORT_SYMBOL_GPL(pvclock_gtod_unregister_notifier);
 static inline void tk_update_leap_state(struct timekeeper *tk)
 {
         tk->next_leap_ktime = ntp_get_next_leap();
-        if (tk->next_leap_ktime.tv64 != KTIME_MAX)
+        if (tk->next_leap_ktime != KTIME_MAX)
                 /* Convert to monotonic time */
                 tk->next_leap_ktime = ktime_sub(tk->next_leap_ktime, tk->offs_real);
 }
@@ -2250,7 +2250,7 @@ ktime_t ktime_get_update_offsets_now(unsigned int *cwsseq, ktime_t *offs_real,
                 }
 
                 /* Handle leapsecond insertion adjustments */
-                if (unlikely(base.tv64 >= tk->next_leap_ktime.tv64))
+                if (unlikely(base >= tk->next_leap_ktime))
                         *offs_real = ktime_sub(tk->offs_real, ktime_set(1, 0));
 
         } while (read_seqcount_retry(&tk_core.seq, seq));