diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-01-30 11:22:39 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-01-30 11:22:39 +0100 |
| commit | 9556ad6ad0c60a23a7db36af65c9ffff51bbf644 (patch) | |
| tree | 1464f3b838ba56404c2959f0d96ed8f523486378 /kernel/time/timekeeping.h | |
| parent | 4c45c5167c9563b1a2eee3e2fe954621355e4ca8 (diff) | |
| parent | b18b6a9cef7f30e9a8b7738d5fc8d568cf660855 (diff) | |
Merge branch 'fortglx/4.11/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
- Remove unused functions
- Document udelay inaccuracy
- Remove posix timer data from task struct when posix timers are off
Diffstat (limited to 'kernel/time/timekeeping.h')
| -rw-r--r-- | kernel/time/timekeeping.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h index 704f595ce83f..d0914676d4c5 100644 --- a/kernel/time/timekeeping.h +++ b/kernel/time/timekeeping.h @@ -11,8 +11,6 @@ extern ktime_t ktime_get_update_offsets_now(unsigned int *cwsseq, extern int timekeeping_valid_for_hres(void); extern u64 timekeeping_max_deferment(void); extern int timekeeping_inject_offset(struct timespec *ts); -extern s32 timekeeping_get_tai_offset(void); -extern void timekeeping_set_tai_offset(s32 tai_offset); extern int timekeeping_suspend(void); extern void timekeeping_resume(void); |