Commit cdba2ec5 authored by John Stultz's avatar John Stultz
Browse files

time: Expose getrawmonotonic64 for in-kernel uses 



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

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

include/linux/timekeeping.h

+14 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ struct timespec __current_kernel_time(void); 
 * timespec based interfaces

 */

struct timespec get_monotonic_coarse(void);

extern void getrawmonotonic(struct timespec *ts);

extern void getrawmonotonic64(struct timespec64 *ts);

extern void ktime_get_ts64(struct timespec64 *ts);



extern int __getnstimeofday64(struct timespec64 *tv);
@@ -61,6 +61,11 @@ static inline void ktime_get_real_ts(struct timespec *ts) 
	getnstimeofday64(ts);

}



static inline void getrawmonotonic(struct timespec *ts)

{

	getrawmonotonic64(ts);

}



#else

/**

 * Deprecated. Use do_settimeofday64().
@@ -105,6 +110,14 @@ static inline void ktime_get_real_ts(struct timespec *ts) 
	getnstimeofday64(&ts64);

	*ts = timespec64_to_timespec(ts64);

}



static inline void getrawmonotonic(struct timespec *ts)

{

	struct timespec64 ts64;



	getrawmonotonic64(&ts64);

	*ts = timespec64_to_timespec(ts64);

}

#endif



extern void getboottime(struct timespec *ts);

kernel/time/timekeeping.c

+6 −5
Original line number Diff line number Diff line
@@ -894,12 +894,12 @@ int timekeeping_notify(struct clocksource *clock) 
}



/**

 * getrawmonotonic - Returns the raw monotonic time in a timespec

 * @ts:		pointer to the timespec to be set

 * getrawmonotonic64 - Returns the raw monotonic time in a timespec

 * @ts:		pointer to the timespec64 to be set

 *

 * Returns the raw monotonic time (completely un-modified by ntp)

 */

void getrawmonotonic(struct timespec *ts)

void getrawmonotonic64(struct timespec64 *ts)

{

	struct timekeeper *tk = &tk_core.timekeeper;

	struct timespec64 ts64;
@@ -914,9 +914,10 @@ void getrawmonotonic(struct timespec *ts) 
	} while (read_seqcount_retry(&tk_core.seq, seq));



	timespec64_add_ns(&ts64, nsecs);

	*ts = timespec64_to_timespec(ts64);

	*ts = ts64;

}

EXPORT_SYMBOL(getrawmonotonic);

EXPORT_SYMBOL(getrawmonotonic64);





/**

 * timekeeping_valid_for_hres - Check if timekeeping is suitable for hres