timekeeping: Use tk_read_base as argument for timekeeping_get_ns()

All the function needs is in the tk_read_base struct. No functional
change for the current code, just a preparatory patch for the NMI safe
accessor to clock monotonic which will use struct tk_read_base as well.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index ccb69980ef7e80041904cdd024427feb170af77a..dee23c9d6c2168437fcc8e4637898bbfe3474cac 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -173,19 +173,19 @@ u32 (*arch_gettimeoffset)(void) = default_arch_gettimeoffset;
 static inline u32 arch_gettimeoffset(void) { return 0; }
 #endif
 
-static inline s64 timekeeping_get_ns(struct timekeeper *tk)
+static inline s64 timekeeping_get_ns(struct tk_read_base *tkr)
 {
        cycle_t cycle_now, delta;
        s64 nsec;
 
        /* read clocksource: */
-       cycle_now = tk->tkr.read(tk->tkr.clock);
+       cycle_now = tkr->read(tkr->clock);
 
        /* calculate the delta since the last update_wall_time: */
-       delta = clocksource_delta(cycle_now, tk->tkr.cycle_last, tk->tkr.mask);
+       delta = clocksource_delta(cycle_now, tkr->cycle_last, tkr->mask);
 
-       nsec = delta * tk->tkr.mult + tk->tkr.xtime_nsec;
-       nsec >>= tk->tkr.shift;
+       nsec = delta * tkr->mult + tkr->xtime_nsec;
+       nsec >>= tkr->shift;
 
        /* If arch requires, add in get_arch_timeoffset() */
        return nsec + arch_gettimeoffset();
@@ -372,7 +372,7 @@ int __getnstimeofday64(struct timespec64 *ts)
                seq = read_seqcount_begin(&tk_core.seq);
 
                ts->tv_sec = tk->xtime_sec;
-               nsecs = timekeeping_get_ns(tk);
+               nsecs = timekeeping_get_ns(&tk->tkr);
 
        } while (read_seqcount_retry(&tk_core.seq, seq));
 
@@ -413,7 +413,7 @@ ktime_t ktime_get(void)
        do {
                seq = read_seqcount_begin(&tk_core.seq);
                base = tk->tkr.base_mono;
-               nsecs = timekeeping_get_ns(tk);
+               nsecs = timekeeping_get_ns(&tk->tkr);
 
        } while (read_seqcount_retry(&tk_core.seq, seq));
 
@@ -439,7 +439,7 @@ ktime_t ktime_get_with_offset(enum tk_offsets offs)
        do {
                seq = read_seqcount_begin(&tk_core.seq);
                base = ktime_add(tk->tkr.base_mono, *offset);
-               nsecs = timekeeping_get_ns(tk);
+               nsecs = timekeeping_get_ns(&tk->tkr);
 
        } while (read_seqcount_retry(&tk_core.seq, seq));
 
@@ -509,7 +509,7 @@ void ktime_get_ts64(struct timespec64 *ts)
        do {
                seq = read_seqcount_begin(&tk_core.seq);
                ts->tv_sec = tk->xtime_sec;
-               nsec = timekeeping_get_ns(tk);
+               nsec = timekeeping_get_ns(&tk->tkr);
                tomono = tk->wall_to_monotonic;
 
        } while (read_seqcount_retry(&tk_core.seq, seq));
@@ -547,7 +547,7 @@ void getnstime_raw_and_real(struct timespec *ts_raw, struct timespec *ts_real)
                ts_real->tv_nsec = 0;
 
                nsecs_raw = timekeeping_get_ns_raw(tk);
-               nsecs_real = timekeeping_get_ns(tk);
+               nsecs_real = timekeeping_get_ns(&tk->tkr);
 
        } while (read_seqcount_retry(&tk_core.seq, seq));
 
@@ -1624,7 +1624,7 @@ ktime_t ktime_get_update_offsets_now(ktime_t *offs_real, ktime_t *offs_boot,
                seq = read_seqcount_begin(&tk_core.seq);
 
                base = tk->tkr.base_mono;
-               nsecs = timekeeping_get_ns(tk);
+               nsecs = timekeeping_get_ns(&tk->tkr);
 
                *offs_real = tk->offs_real;
                *offs_boot = tk->offs_boot;