diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-10 12:03:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-10 12:03:58 -0800 |
| commit | 621084cd3d8cb31aa43a3e4cc37e27e3ddaab561 (patch) | |
| tree | 2ab46086ac6e3618d657d733e69170ce037223a6 /include | |
| parent | 81388c2b3fb16972c699aab8a4f80ba85d0f9360 (diff) | |
| parent | 52338415cf4d4064ae6b8dd972dadbda841da4fa (diff) | |
| download | linux-stable-621084cd3d8cb31aa43a3e4cc37e27e3ddaab561.tar.gz linux-stable-621084cd3d8cb31aa43a3e4cc37e27e3ddaab561.tar.bz2 linux-stable-621084cd3d8cb31aa43a3e4cc37e27e3ddaab561.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"A small set of fixes for timekeepoing and clocksource drivers:
- VDSO data was updated conditional on the availability of a VDSO
capable clocksource. This causes the VDSO functions which do not
depend on a VDSO capable clocksource to operate on stale data.
Always update unconditionally.
- Prevent a double free in the mediatek driver
- Use the proper helper in the sh_mtu2 driver so it won't attempt to
initialize non-existing interrupts"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping/vsyscall: Update VDSO data unconditionally
clocksource/drivers/sh_mtu2: Do not loop using platform_get_irq_by_name()
clocksource/drivers/mediatek: Fix error handling
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/vdso/vsyscall.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso/vsyscall.h index e94b19782c92..ce4103208619 100644 --- a/include/asm-generic/vdso/vsyscall.h +++ b/include/asm-generic/vdso/vsyscall.h @@ -25,13 +25,6 @@ static __always_inline int __arch_get_clock_mode(struct timekeeper *tk) } #endif /* __arch_get_clock_mode */ -#ifndef __arch_use_vsyscall -static __always_inline int __arch_use_vsyscall(struct vdso_data *vdata) -{ - return 1; -} -#endif /* __arch_use_vsyscall */ - #ifndef __arch_update_vsyscall static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata, struct timekeeper *tk) |