ktime: Kill non-scalar ktime_t implementation for 2038

[linux.git] / kernel / time / timekeeping.c

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 32d8d6aaedb820e3ce3bc13b0c9f0fe9b05b3813..cafef242d8f9886991c5f388a65cd375c955ec62 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -153,16 +153,10 @@ static void tk_setup_internals(struct timekeeper *tk, struct clocksource *clock)
 /* Timekeeper helper functions. */
 
 #ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
-u32 (*arch_gettimeoffset)(void);
-
-u32 get_arch_timeoffset(void)
-{
-       if (likely(arch_gettimeoffset))
-               return arch_gettimeoffset();
-       return 0;
-}
+static u32 default_arch_gettimeoffset(void) { return 0; }
+u32 (*arch_gettimeoffset)(void) = default_arch_gettimeoffset;
 #else
-static inline u32 get_arch_timeoffset(void) { return 0; }
+static inline u32 arch_gettimeoffset(void) { return 0; }
 #endif
 
 static inline s64 timekeeping_get_ns(struct timekeeper *tk)
@@ -182,7 +176,7 @@ static inline s64 timekeeping_get_ns(struct timekeeper *tk)
        nsec >>= tk->shift;
 
        /* If arch requires, add in get_arch_timeoffset() */
-       return nsec + get_arch_timeoffset();
+       return nsec + arch_gettimeoffset();
 }
 
 static inline s64 timekeeping_get_ns_raw(struct timekeeper *tk)
@@ -202,7 +196,7 @@ static inline s64 timekeeping_get_ns_raw(struct timekeeper *tk)
        nsec = clocksource_cyc2ns(cycle_delta, clock->mult, clock->shift);
 
        /* If arch requires, add in get_arch_timeoffset() */
-       return nsec + get_arch_timeoffset();
+       return nsec + arch_gettimeoffset();
 }
 
 static RAW_NOTIFIER_HEAD(pvclock_gtod_chain);
@@ -282,7 +276,7 @@ static void timekeeping_forward_now(struct timekeeper *tk)
        tk->xtime_nsec += cycle_delta * tk->mult;
 
        /* If arch requires, add in get_arch_timeoffset() */
-       tk->xtime_nsec += (u64)get_arch_timeoffset() << tk->shift;
+       tk->xtime_nsec += (u64)arch_gettimeoffset() << tk->shift;
 
        tk_normalize_xtime(tk);
 
@@ -350,11 +344,8 @@ ktime_t ktime_get(void)
                nsecs = timekeeping_get_ns(tk) + tk->wall_to_monotonic.tv_nsec;
 
        } while (read_seqcount_retry(&timekeeper_seq, seq));
-       /*
-        * Use ktime_set/ktime_add_ns to create a proper ktime on
-        * 32-bit architectures without CONFIG_KTIME_SCALAR.
-        */
-       return ktime_add_ns(ktime_set(secs, 0), nsecs);
+
+       return ktime_set(secs, nsecs);
 }
 EXPORT_SYMBOL_GPL(ktime_get);
 
@@ -1587,29 +1578,39 @@ void do_timer(unsigned long ticks)
 }
 
 /**
- * get_xtime_and_monotonic_and_sleep_offset() - get xtime, wall_to_monotonic,
- *    and sleep offsets.
- * @xtim:      pointer to timespec to be set with xtime
- * @wtom:      pointer to timespec to be set with wall_to_monotonic
- * @sleep:     pointer to timespec to be set with time in suspend
+ * ktime_get_update_offsets_tick - hrtimer helper
+ * @offs_real: pointer to storage for monotonic -> realtime offset
+ * @offs_boot: pointer to storage for monotonic -> boottime offset
+ * @offs_tai:  pointer to storage for monotonic -> clock tai offset
+ *
+ * Returns monotonic time at last tick and various offsets
  */
-void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim,
-                               struct timespec *wtom, struct timespec *sleep)
+ktime_t ktime_get_update_offsets_tick(ktime_t *offs_real, ktime_t *offs_boot,
+                                                       ktime_t *offs_tai)
 {
        struct timekeeper *tk = &timekeeper;
-       unsigned long seq;
+       struct timespec ts;
+       ktime_t now;
+       unsigned int seq;
 
        do {
                seq = read_seqcount_begin(&timekeeper_seq);
-               *xtim = tk_xtime(tk);
-               *wtom = tk->wall_to_monotonic;
-               *sleep = tk->total_sleep_time;
+
+               ts = tk_xtime(tk);
+
+               *offs_real = tk->offs_real;
+               *offs_boot = tk->offs_boot;
+               *offs_tai = tk->offs_tai;
        } while (read_seqcount_retry(&timekeeper_seq, seq));
+
+       now = ktime_set(ts.tv_sec, ts.tv_nsec);
+       now = ktime_sub(now, *offs_real);
+       return now;
 }
 
 #ifdef CONFIG_HIGH_RES_TIMERS
 /**
- * ktime_get_update_offsets - hrtimer helper
+ * ktime_get_update_offsets_now - hrtimer helper
  * @offs_real: pointer to storage for monotonic -> realtime offset
  * @offs_boot: pointer to storage for monotonic -> boottime offset
  * @offs_tai:  pointer to storage for monotonic -> clock tai offset
@@ -1617,7 +1618,7 @@ void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim,
  * Returns current monotonic time and updates the offsets
  * Called from hrtimer_interrupt() or retrigger_next_event()
  */
-ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot,
+ktime_t ktime_get_update_offsets_now(ktime_t *offs_real, ktime_t *offs_boot,
                                                        ktime_t *offs_tai)
 {
        struct timekeeper *tk = &timekeeper;