mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
timekeeping: Standardize on ktime_get_*() naming
The current_kernel_time64, get_monotonic_coarse64, getrawmonotonic64, get_monotonic_boottime64 and timekeeping_clocktai64 interfaces have rather inconsistent naming, and they differ in the calling conventions by passing the output either by reference or as a return value. Rename them to ktime_get_coarse_real_ts64, ktime_get_coarse_ts64, ktime_get_raw_ts64, ktime_get_boottime_ts64 and ktime_get_clocktai_ts64 respectively, and provide the interfaces with macros or inline functions as needed. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Stephen Boyd <sboyd@kernel.org> Cc: y2038@lists.linaro.org Cc: John Stultz <john.stultz@linaro.org> Link: https://lkml.kernel.org/r/20180427134016.2525989-4-arnd@arndb.de
This commit is contained in:
parent
edca71fecb
commit
fb7fcc96a8
3 changed files with 51 additions and 29 deletions
|
@ -19,25 +19,25 @@ extern void xtime_update(unsigned long ticks);
|
|||
extern int do_settimeofday64(const struct timespec64 *ts);
|
||||
extern int do_sys_settimeofday64(const struct timespec64 *tv,
|
||||
const struct timezone *tz);
|
||||
/*
|
||||
* Kernel time accessors
|
||||
*/
|
||||
struct timespec64 current_kernel_time64(void);
|
||||
|
||||
/*
|
||||
* timespec64 based interfaces
|
||||
*/
|
||||
struct timespec64 get_monotonic_coarse64(void);
|
||||
extern void getrawmonotonic64(struct timespec64 *ts);
|
||||
extern void ktime_get_raw_ts64(struct timespec64 *ts);
|
||||
extern void ktime_get_ts64(struct timespec64 *ts);
|
||||
extern void ktime_get_real_ts64(struct timespec64 *tv);
|
||||
extern void ktime_get_coarse_ts64(struct timespec64 *ts);
|
||||
extern void ktime_get_coarse_real_ts64(struct timespec64 *ts);
|
||||
|
||||
void getboottime64(struct timespec64 *ts);
|
||||
|
||||
/*
|
||||
* time64_t base interfaces
|
||||
*/
|
||||
extern time64_t ktime_get_seconds(void);
|
||||
extern time64_t __ktime_get_real_seconds(void);
|
||||
extern time64_t ktime_get_real_seconds(void);
|
||||
|
||||
extern void getboottime64(struct timespec64 *ts);
|
||||
|
||||
|
||||
/*
|
||||
* ktime_t based interfaces
|
||||
*/
|
||||
|
@ -123,12 +123,12 @@ extern u64 ktime_get_real_fast_ns(void);
|
|||
/*
|
||||
* timespec64 interfaces utilizing the ktime based ones
|
||||
*/
|
||||
static inline void get_monotonic_boottime64(struct timespec64 *ts)
|
||||
static inline void ktime_get_boottime_ts64(struct timespec64 *ts)
|
||||
{
|
||||
*ts = ktime_to_timespec64(ktime_get_boottime());
|
||||
}
|
||||
|
||||
static inline void timekeeping_clocktai64(struct timespec64 *ts)
|
||||
static inline void ktime_get_clocktai_ts64(struct timespec64 *ts)
|
||||
{
|
||||
*ts = ktime_to_timespec64(ktime_get_clocktai());
|
||||
}
|
||||
|
@ -212,5 +212,26 @@ extern int update_persistent_clock64(struct timespec64 now);
|
|||
* deprecated aliases, don't use in new code
|
||||
*/
|
||||
#define getnstimeofday64(ts) ktime_get_real_ts64(ts)
|
||||
#define get_monotonic_boottime64(ts) ktime_get_boottime_ts64(ts)
|
||||
#define getrawmonotonic64(ts) ktime_get_raw_ts64(ts)
|
||||
#define timekeeping_clocktai64(ts) ktime_get_clocktai_ts64(ts)
|
||||
|
||||
static inline struct timespec64 current_kernel_time64(void)
|
||||
{
|
||||
struct timespec64 ts;
|
||||
|
||||
ktime_get_coarse_real_ts64(&ts);
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
||||
static inline struct timespec64 get_monotonic_coarse64(void)
|
||||
{
|
||||
struct timespec64 ts;
|
||||
|
||||
ktime_get_coarse_ts64(&ts);
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue