diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:03:17 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:03:17 +0100 |
| commit | e2666d69068aba300d6c0dfe96489552f653be2a (patch) | |
| tree | 07fa371d800deec45225589ebe6154dcc6c956b2 /kernel/time/timekeeping_internal.h | |
| parent | d33f250af4e67d449f2c748b861ba99d50955469 (diff) | |
| parent | ec02b076ceab63f99e5b3d80fd223d777266c236 (diff) | |
| download | op-kernel-dev-e2666d69068aba300d6c0dfe96489552f653be2a.zip op-kernel-dev-e2666d69068aba300d6c0dfe96489552f653be2a.tar.gz | |
Merge branch 'fortglx/4.5/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Get the core time(keeping) updates from John Stultz
- NTP robustness tweaks
- Another signed overflow nailed down
- More y2038 changes
- Stop alarmtimer after resume
- MAINTAINERS update
- Selftest fixes
Diffstat (limited to 'kernel/time/timekeeping_internal.h')
| -rw-r--r-- | kernel/time/timekeeping_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time/timekeeping_internal.h b/kernel/time/timekeeping_internal.h index 4ea005a..e20466f 100644 --- a/kernel/time/timekeeping_internal.h +++ b/kernel/time/timekeeping_internal.h @@ -26,4 +26,6 @@ static inline cycle_t clocksource_delta(cycle_t now, cycle_t last, cycle_t mask) } #endif +extern time64_t __ktime_get_real_seconds(void); + #endif /* _TIMEKEEPING_INTERNAL_H */ |
