leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timekeeping: Use tk_read_base as argument for timekeeping_get_ns()

Browse Source 
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>
This commit is contained in:
Thomas Gleixner 2014-07-16 21:05:18 +00:00 committed by John Stultz
parent d28ede8379
commit 0e5ac3a8b1
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/time/timekeeping.c
View File

@ -173,19 +173,19 @@ u32 (*arch_gettimeoffset)(void) = default_arch_gettimeoffset;
static inline u32 arch_gettimeoffset(void) { return 0; } static inline u32 arch_gettimeoffset(void) { return 0; }
#endif #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; cycle_t cycle_now, delta;
s64 nsec; s64 nsec;
/* read clocksource: */ /* 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: */ /* 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 = delta * tkr->mult + tkr->xtime_nsec;
nsec >>= tk->tkr.shift; nsec >>= tkr->shift;
/* If arch requires, add in get_arch_timeoffset() */ /* If arch requires, add in get_arch_timeoffset() */
return nsec + arch_gettimeoffset(); return nsec + arch_gettimeoffset();
@ -372,7 +372,7 @@ int __getnstimeofday64(struct timespec64 *ts)
seq = read_seqcount_begin(&tk_core.seq); seq = read_seqcount_begin(&tk_core.seq);
ts->tv_sec = tk->xtime_sec; 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)); } while (read_seqcount_retry(&tk_core.seq, seq));
@ -413,7 +413,7 @@ ktime_t ktime_get(void)
do { do {
seq = read_seqcount_begin(&tk_core.seq); seq = read_seqcount_begin(&tk_core.seq);
base = tk->tkr.base_mono; base = tk->tkr.base_mono;
nsecs = timekeeping_get_ns(tk); nsecs = timekeeping_get_ns(&tk->tkr);
} while (read_seqcount_retry(&tk_core.seq, seq)); } while (read_seqcount_retry(&tk_core.seq, seq));
@ -439,7 +439,7 @@ ktime_t ktime_get_with_offset(enum tk_offsets offs)
do { do {
seq = read_seqcount_begin(&tk_core.seq); seq = read_seqcount_begin(&tk_core.seq);
base = ktime_add(tk->tkr.base_mono, *offset); 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)); } while (read_seqcount_retry(&tk_core.seq, seq));
@ -509,7 +509,7 @@ void ktime_get_ts64(struct timespec64 *ts)
do { do {
seq = read_seqcount_begin(&tk_core.seq); seq = read_seqcount_begin(&tk_core.seq);
ts->tv_sec = tk->xtime_sec; ts->tv_sec = tk->xtime_sec;
nsec = timekeeping_get_ns(tk); nsec = timekeeping_get_ns(&tk->tkr);
tomono = tk->wall_to_monotonic; tomono = tk->wall_to_monotonic;
} while (read_seqcount_retry(&tk_core.seq, seq)); } 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; ts_real->tv_nsec = 0;
nsecs_raw = timekeeping_get_ns_raw(tk); 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)); } 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); seq = read_seqcount_begin(&tk_core.seq);
base = tk->tkr.base_mono; base = tk->tkr.base_mono;
nsecs = timekeeping_get_ns(tk); nsecs = timekeeping_get_ns(&tk->tkr);
*offs_real = tk->offs_real; *offs_real = tk->offs_real;
*offs_boot = tk->offs_boot; *offs_boot = tk->offs_boot;