mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: John Stultz <john.stultz@linaro.org>
This commit is contained in:
John Stultz 2014-11-07 11:03:20 -08:00
parent 90b6ce9c40
commit cdba2ec538
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/timekeeping.h
View File

@ -26,7 +26,7 @@ struct timespec __current_kernel_time(void);
* timespec based interfaces * timespec based interfaces
*/ */
struct timespec get_monotonic_coarse(void); 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 void ktime_get_ts64(struct timespec64 *ts);
extern int __getnstimeofday64(struct timespec64 *tv); extern int __getnstimeofday64(struct timespec64 *tv);
@ -61,6 +61,11 @@ static inline void ktime_get_real_ts(struct timespec *ts)
getnstimeofday64(ts); getnstimeofday64(ts);
} }
static inline void getrawmonotonic(struct timespec *ts)
{
getrawmonotonic64(ts);
}
#else #else
/** /**
* Deprecated. Use do_settimeofday64(). * Deprecated. Use do_settimeofday64().
@ -105,6 +110,14 @@ static inline void ktime_get_real_ts(struct timespec *ts)
getnstimeofday64(&ts64); getnstimeofday64(&ts64);
*ts = timespec64_to_timespec(ts64); *ts = timespec64_to_timespec(ts64);
} }
static inline void getrawmonotonic(struct timespec *ts)
{
struct timespec64 ts64;
getrawmonotonic64(&ts64);
*ts = timespec64_to_timespec(ts64);
}
#endif #endif
extern void getboottime(struct timespec *ts); extern void getboottime(struct timespec *ts);

11
kernel/time/timekeeping.c
View File

@ -894,12 +894,12 @@ int timekeeping_notify(struct clocksource *clock)
} }
/** /**
* getrawmonotonic - Returns the raw monotonic time in a timespec * getrawmonotonic64 - Returns the raw monotonic time in a timespec
* @ts: pointer to the timespec to be set * @ts: pointer to the timespec64 to be set
* *
* Returns the raw monotonic time (completely un-modified by ntp) * 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 timekeeper *tk = &tk_core.timekeeper;
struct timespec64 ts64; struct timespec64 ts64;
@ -914,9 +914,10 @@ void getrawmonotonic(struct timespec *ts)
} while (read_seqcount_retry(&tk_core.seq, seq)); } while (read_seqcount_retry(&tk_core.seq, seq));
timespec64_add_ns(&ts64, nsecs); 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 * timekeeping_valid_for_hres - Check if timekeeping is suitable for hres