__arch_update_vdso_clock() and __arch_sync_vdso_time_data() are only used in vsyscall.c. vsyscall.h has become a dumping ground for different kinds of fallbacks.
Move the fallback function definitions into vsyscall.c. Signed-off-by: Thomas Weißschuh <[email protected]> --- include/asm-generic/vdso/vsyscall.h | 11 ----------- kernel/time/vsyscall.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso/vsyscall.h index cdf7b39cd349..cfb740e82cb5 100644 --- a/include/asm-generic/vdso/vsyscall.h +++ b/include/asm-generic/vdso/vsyscall.h @@ -4,17 +4,6 @@ #ifndef __ASSEMBLER__ -#ifndef __arch_update_vdso_clock -static __always_inline void __arch_update_vdso_clock(struct vdso_clock *vc) -{ -} -#endif /* __arch_update_vdso_clock */ - -#ifndef __arch_sync_vdso_time_data -static __always_inline void __arch_sync_vdso_time_data(struct vdso_time_data *vdata) -{ -} -#endif /* __arch_sync_vdso_time_data */ #endif /* !__ASSEMBLER__ */ diff --git a/kernel/time/vsyscall.c b/kernel/time/vsyscall.c index 12e205d86e7f..193a02d78b11 100644 --- a/kernel/time/vsyscall.c +++ b/kernel/time/vsyscall.c @@ -16,6 +16,18 @@ #include "timekeeping_internal.h" +#ifndef __arch_update_vdso_clock +static __always_inline void __arch_update_vdso_clock(struct vdso_clock *vc) +{ +} +#endif /* __arch_update_vdso_clock */ + +#ifndef __arch_sync_vdso_time_data +static __always_inline void __arch_sync_vdso_time_data(struct vdso_time_data *vdata) +{ +} +#endif /* __arch_sync_vdso_time_data */ + static inline void fill_clock_configuration(struct vdso_clock *vc, const struct tk_read_base *base) { vc->cycle_last = base->cycle_last; -- 2.55.0
