Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b094cd0 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by John Stultz
Browse files

time: Consolidate the time accessor prototypes 



Right now we have time related prototypes in 3 different header
files. Move it to a single timekeeping header file and move the core
internal stuff into a core private header.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 7d489d15

include/linux/hrtimer.h

+0 −11
Original line number Diff line number Diff line
@@ -326,17 +326,6 @@ static inline void timerfd_clock_was_set(void) { } 
#endif

extern void hrtimers_resume(void);



extern ktime_t ktime_get(void);

extern ktime_t ktime_get_real(void);

extern ktime_t ktime_get_boottime(void);

extern ktime_t ktime_get_monotonic_offset(void);

extern ktime_t ktime_get_clocktai(void);

extern ktime_t ktime_get_update_offsets_tick(ktime_t *offs_real,

						ktime_t *offs_boot,

						ktime_t *offs_tai);

extern ktime_t ktime_get_update_offsets_now(ktime_t *offs_real,

						ktime_t *offs_boot,

						ktime_t *offs_tai);

DECLARE_PER_CPU(struct tick_device, tick_cpu_device);

include/linux/ktime.h

+2 −6
Original line number Diff line number Diff line
@@ -250,12 +250,6 @@ static inline __must_check bool ktime_to_timespec64_cond(const ktime_t kt, 
#define LOW_RES_NSEC		TICK_NSEC

#define KTIME_LOW_RES		(ktime_t){ .tv64 = LOW_RES_NSEC }



/* Get the monotonic time in timespec format: */

extern void ktime_get_ts(struct timespec *ts);



/* Get the real (wall-) time in timespec format: */

#define ktime_get_real_ts(ts)	getnstimeofday(ts)



static inline ktime_t ns_to_ktime(u64 ns)

{

	static const ktime_t ktime_zero = { .tv64 = 0 };
@@ -270,4 +264,6 @@ static inline ktime_t ms_to_ktime(u64 ms) 
	return ktime_add_ms(ktime_zero, ms);

}



# include <linux/timekeeping.h>



#endif

include/linux/time.h

+4 −41
Original line number Diff line number Diff line
@@ -99,25 +99,7 @@ static inline bool timespec_valid_strict(const struct timespec *ts) 
	return true;

}



extern bool persistent_clock_exist;



static inline bool has_persistent_clock(void)

{

	return persistent_clock_exist;

}



extern void read_persistent_clock(struct timespec *ts);

extern void read_boot_clock(struct timespec *ts);

extern int persistent_clock_is_local;

extern int update_persistent_clock(struct timespec now);

void timekeeping_init(void);

extern int timekeeping_suspended;



unsigned long get_seconds(void);

struct timespec current_kernel_time(void);

struct timespec __current_kernel_time(void); /* does not take xtime_lock */

struct timespec get_monotonic_coarse(void);

void timekeeping_inject_sleeptime(struct timespec *delta);

extern struct timespec timespec_trunc(struct timespec t, unsigned gran);



#define CURRENT_TIME		(current_kernel_time())

#define CURRENT_TIME_SEC	((struct timespec) { get_seconds(), 0 })
@@ -135,33 +117,14 @@ void timekeeping_inject_sleeptime(struct timespec *delta); 
extern u32 (*arch_gettimeoffset)(void);

#endif



extern void do_gettimeofday(struct timeval *tv);

extern int do_settimeofday(const struct timespec *tv);

extern int do_sys_settimeofday(const struct timespec *tv,

			       const struct timezone *tz);

#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)

extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags);

struct itimerval;

extern int do_setitimer(int which, struct itimerval *value,

			struct itimerval *ovalue);

extern unsigned int alarm_setitimer(unsigned int seconds);

extern int do_getitimer(int which, struct itimerval *value);

extern int __getnstimeofday(struct timespec *tv);

extern void getnstimeofday(struct timespec *tv);

extern void getrawmonotonic(struct timespec *ts);

extern void getnstime_raw_and_real(struct timespec *ts_raw,

		struct timespec *ts_real);

extern void getboottime(struct timespec *ts);

extern void monotonic_to_bootbased(struct timespec *ts);

extern void get_monotonic_boottime(struct timespec *ts);



extern struct timespec timespec_trunc(struct timespec t, unsigned gran);

extern int timekeeping_valid_for_hres(void);

extern u64 timekeeping_max_deferment(void);

extern int timekeeping_inject_offset(struct timespec *ts);

extern s32 timekeeping_get_tai_offset(void);

extern void timekeeping_set_tai_offset(s32 tai_offset);

extern void timekeeping_clocktai(struct timespec *ts);

extern unsigned int alarm_setitimer(unsigned int seconds);



extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags);



struct tms;

extern void do_sys_times(struct tms *);

include/linux/timekeeping.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_TIMEKEEPING_H

#define _LINUX_TIMEKEEPING_H



/* Included from linux/ktime.h */



void timekeeping_init(void);

extern int timekeeping_suspended;



/*

 * Get and set timeofday

 */

extern void do_gettimeofday(struct timeval *tv);

extern int do_settimeofday(const struct timespec *tv);

extern int do_sys_settimeofday(const struct timespec *tv,

			       const struct timezone *tz);



/*

 * Kernel time accessors

 */

unsigned long get_seconds(void);

struct timespec current_kernel_time(void);

/* does not take xtime_lock */

struct timespec __current_kernel_time(void);



/*

 * timespec based interfaces

 */

struct timespec get_monotonic_coarse(void);

extern void getrawmonotonic(struct timespec *ts);

extern void monotonic_to_bootbased(struct timespec *ts);

extern void get_monotonic_boottime(struct timespec *ts);

extern void ktime_get_ts(struct timespec *ts);



extern int __getnstimeofday(struct timespec *tv);

extern void getnstimeofday(struct timespec *tv);

extern void getboottime(struct timespec *ts);



#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)

#define ktime_get_real_ts(ts)	getnstimeofday(ts)





/*

 * ktime_t based interfaces

 */

extern ktime_t ktime_get(void);

extern ktime_t ktime_get_real(void);

extern ktime_t ktime_get_boottime(void);

extern ktime_t ktime_get_monotonic_offset(void);

extern ktime_t ktime_get_clocktai(void);



/*

 * RTC specific

 */

extern void timekeeping_inject_sleeptime(struct timespec *delta);



/*

 * PPS accessor

 */

extern void getnstime_raw_and_real(struct timespec *ts_raw,

				   struct timespec *ts_real);



/*

 * Persistent clock related interfaces

 */

extern bool persistent_clock_exist;

extern int persistent_clock_is_local;



static inline bool has_persistent_clock(void)

{

	return persistent_clock_exist;

}



extern void read_persistent_clock(struct timespec *ts);

extern void read_boot_clock(struct timespec *ts);

extern int update_persistent_clock(struct timespec now);





#endif

kernel/time/hrtimer.c

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ 


#include <trace/events/timer.h>



#include "timekeeping.h"



/*

 * The timer bases:

 *