Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

vdso: Remove timekeeper argument of __arch_update_vsyscall()

No implementation of this hook uses the passed in timekeeper anymore.

This avoids including a non-VDSO header while building the VDSO, which can
lead to compilation errors.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/all/20241010-vdso-generic-arch_update_vsyscall-v1-1-7fe5a3ea4382@linutronix.de

authored by

Thomas Weißschuh and committed by
Thomas Gleixner
39c089a0 8cf0b939

+3 -5
+1 -2
arch/arm64/include/asm/vdso/vsyscall.h
··· 6 6 7 7 #ifndef __ASSEMBLY__ 8 8 9 - #include <linux/timekeeper_internal.h> 10 9 #include <vdso/datapage.h> 11 10 12 11 enum vvar_pages { ··· 36 37 #define __arch_get_k_vdso_rng_data __arm64_get_k_vdso_rnd_data 37 38 38 39 static __always_inline 39 - void __arm64_update_vsyscall(struct vdso_data *vdata, struct timekeeper *tk) 40 + void __arm64_update_vsyscall(struct vdso_data *vdata) 40 41 { 41 42 vdata[CS_HRES_COARSE].mask = VDSO_PRECISION_MASK; 42 43 vdata[CS_RAW].mask = VDSO_PRECISION_MASK;
+1 -2
include/asm-generic/vdso/vsyscall.h
··· 12 12 #endif /* __arch_get_k_vdso_data */ 13 13 14 14 #ifndef __arch_update_vsyscall 15 - static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata, 16 - struct timekeeper *tk) 15 + static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata) 17 16 { 18 17 } 19 18 #endif /* __arch_update_vsyscall */
+1 -1
kernel/time/vsyscall.c
··· 119 119 if (clock_mode != VDSO_CLOCKMODE_NONE) 120 120 update_vdso_data(vdata, tk); 121 121 122 - __arch_update_vsyscall(vdata, tk); 122 + __arch_update_vsyscall(vdata); 123 123 124 124 vdso_write_end(vdata); 125 125