diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-08-20 21:13:22 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-08-20 21:13:22 +0200 |
| commit | 05ddaa4d6d3806bebdf14f7c5de742a6e0e3b689 (patch) | |
| tree | cbad6d1db5ce324c75b0eecdfd4c0857cfee9347 /include/linux/timekeeping.h | |
| parent | b48362d8aaf32aeb4a75f5c556c652ffeeb1be5d (diff) | |
| parent | 9ca308506062fc4a4ee8ca7ad2f71033c831c2fb (diff) | |
| download | linux-05ddaa4d6d3806bebdf14f7c5de742a6e0e3b689.tar.gz linux-05ddaa4d6d3806bebdf14f7c5de742a6e0e3b689.tar.bz2 linux-05ddaa4d6d3806bebdf14f7c5de742a6e0e3b689.zip | |
Merge branch 'fortglx/4.3/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
- A handful or y2038 related items
- A walltime to monotonic limit
- Small fixes for timespec_trunc() and timer_list output
Diffstat (limited to 'include/linux/timekeeping.h')
| -rw-r--r-- | include/linux/timekeeping.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 6e191e4e6ab6..ba0ae09cbb21 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -18,10 +18,17 @@ extern int do_sys_settimeofday(const struct timespec *tv, * Kernel time accessors */ unsigned long get_seconds(void); -struct timespec current_kernel_time(void); +struct timespec64 current_kernel_time64(void); /* does not take xtime_lock */ struct timespec __current_kernel_time(void); +static inline struct timespec current_kernel_time(void) +{ + struct timespec64 now = current_kernel_time64(); + + return timespec64_to_timespec(now); +} + /* * timespec based interfaces */ |