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

Commit 334334b5 authored by John Stultz's avatar John Stultz
Browse files

time: Expose get_monotonic_coarse64() for in-kernel uses 



Adds a timespec64 based get_monotonic_coarse64() implementation
that can be used as we convert internal users of
get_monotonic_coarse away from using timespecs.

Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent cdba2ec5

include/linux/timekeeping.h

+10 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct timespec __current_kernel_time(void); 
/*

 * timespec based interfaces

 */

struct timespec get_monotonic_coarse(void);

struct timespec64 get_monotonic_coarse64(void);

extern void getrawmonotonic64(struct timespec64 *ts);

extern void ktime_get_ts64(struct timespec64 *ts);
@@ -66,6 +66,10 @@ static inline void getrawmonotonic(struct timespec *ts) 
	getrawmonotonic64(ts);

}



static inline struct timespec get_monotonic_coarse(void)

{

	return get_monotonic_coarse64();

}

#else

/**

 * Deprecated. Use do_settimeofday64().
@@ -118,6 +122,11 @@ static inline void getrawmonotonic(struct timespec *ts) 
	getrawmonotonic64(&ts64);

	*ts = timespec64_to_timespec(ts64);

}



static inline struct timespec get_monotonic_coarse(void)

{

	return timespec64_to_timespec(get_monotonic_coarse64());

}

#endif



extern void getboottime(struct timespec *ts);

kernel/time/timekeeping.c

+2 −2
Original line number Diff line number Diff line
@@ -1651,7 +1651,7 @@ struct timespec current_kernel_time(void) 
}

EXPORT_SYMBOL(current_kernel_time);



struct timespec get_monotonic_coarse(void)

struct timespec64 get_monotonic_coarse64(void)

{

	struct timekeeper *tk = &tk_core.timekeeper;

	struct timespec64 now, mono;
@@ -1667,7 +1667,7 @@ struct timespec get_monotonic_coarse(void) 
	set_normalized_timespec64(&now, now.tv_sec + mono.tv_sec,

				now.tv_nsec + mono.tv_nsec);



	return timespec64_to_timespec(now);

	return now;

}



/*