diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-24 09:58:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-24 09:58:38 -0800 |
| commit | 025929f46813c572d4ef0b379c704bf664e8a7a3 (patch) | |
| tree | 2ceb94f3cedb4e27c69dea382644d4fb60d486fa /include | |
| parent | 17b6c49da37f5d57d76bf352d32b0ac498e7c133 (diff) | |
| parent | e3fab2f3de081e98c50b7b4ace1b040161d95310 (diff) | |
| download | linux-025929f46813c572d4ef0b379c704bf664e8a7a3.tar.bz2 | |
Merge tag 'timers_urgent_for_v5.11_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Borislav Petkov:
- Fix an integer overflow in the NTP RTC synchronization which led to
the latter happening every 2 seconds instead of the intended every 11
minutes.
- Get rid of now unused get_seconds().
* tag 'timers_urgent_for_v5.11_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
ntp: Fix RTC synchronization on 32-bit platforms
timekeeping: Remove unused get_seconds()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ktime.h | 1 | ||||
| -rw-r--r-- | include/linux/timekeeping32.h | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h index a12b5523cc18..73f20deb497d 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h @@ -230,6 +230,5 @@ static inline ktime_t ms_to_ktime(u64 ms) } # include <linux/timekeeping.h> -# include <linux/timekeeping32.h> #endif diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h deleted file mode 100644 index 266017fc9ee9..000000000000 --- a/include/linux/timekeeping32.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _LINUX_TIMEKEEPING32_H -#define _LINUX_TIMEKEEPING32_H -/* - * These interfaces are all based on the old timespec type - * and should get replaced with the timespec64 based versions - * over time so we can remove the file here. - */ - -static inline unsigned long get_seconds(void) -{ - return ktime_get_real_seconds(); -} - -#endif |